No binaryfiles in VCS please, #370871

(Portage version: 2.2.0_alpha40/cvs/Linux x86_64)

5 files changed, 42 insertions, 28 deletions

diff --git a/x11-misc/xaos/ChangeLog b/x11-misc/xaos/ChangeLog
index ec2e09b1c623..48089c7411bd 100644
--- a/x11-misc/xaos/ChangeLog
+++ b/x11-misc/xaos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xaos
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.37 2011/03/02 13:44:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/ChangeLog,v 1.38 2011/06/13 11:42:21 jlec Exp $
+
+  13 Jun 2011; Justin Lecher <jlec@gentoo.org> xaos-3.2.ebuild,
+  xaos-3.4-r1.ebuild, xaos-3.5-r1.ebuild, -files/xaos.png:
+  No binaryfiles in VCS please, #370871
 
   02 Mar 2011; Justin Lecher <jlec@gentoo.org> xaos-3.4-r1.ebuild,
   xaos-3.5-r1.ebuild:
diff --git a/x11-misc/xaos/files/xaos.png b/x11-misc/xaos/files/xaos.png
deleted file mode 100644
index 43853c502234..000000000000
--- a/x11-misc/xaos/files/xaos.png
+++ /dev/null
diff --git a/x11-misc/xaos/xaos-3.2.ebuild b/x11-misc/xaos/xaos-3.2.ebuild
index 4bc91cf996ca..ef41d05a0662 100644
--- a/x11-misc/xaos/xaos-3.2.ebuild
+++ b/x11-misc/xaos/xaos-3.2.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.2.ebuild,v 1.7 2008/07/31 22:36:54 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.2.ebuild,v 1.8 2011/06/13 11:42:21 jlec Exp $
 
 inherit eutils
 
-IUSE="X svga aalib nls"
-
 MY_PN=XaoS
 MY_P=${MY_PN}-${PV}
 
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="A very fast real-time fractal zoomer"
 HOMEPAGE="http://sourceforge.net/projects/xaos/"
-SRC_URI="mirror://sourceforge/xaos/${MY_P}.tar.gz"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
+	mirror://sourceforge/xaos/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc sparc x86"
+IUSE="X svga aalib nls"
 
 RDEPEND="X? (
 				(
@@ -43,6 +43,8 @@ DEPEND="${RDEPEND}
 				)
 			)"
 
+S="${WORKDIR}"/${MY_P}
+
 src_compile() {
 	local myconf
 	use X     || myconf="--with-x11-driver=no"
diff --git a/x11-misc/xaos/xaos-3.4-r1.ebuild b/x11-misc/xaos/xaos-3.4-r1.ebuild
index 91ab977b1185..7595dd584ae4 100644
--- a/x11-misc/xaos/xaos-3.4-r1.ebuild
+++ b/x11-misc/xaos/xaos-3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.4-r1.ebuild,v 1.2 2011/03/02 13:44:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.4-r1.ebuild,v 1.3 2011/06/13 11:42:21 jlec Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -10,7 +10,9 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="A very fast real-time fractal zoomer"
 HOMEPAGE="http://xaos.sf.net/"
-SRC_URI="mirror://sourceforge/xaos/${MY_P}.tar.gz"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
+	mirror://sourceforge/xaos/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -89,5 +91,5 @@ src_install() {
 	use gtk && driver="\"GTK+ Driver\""
 	make_desktop_entry "xaos -driver ${driver}" "XaoS Fractal Zoomer" \
 		xaos "Application;Education;Math;Graphics;"
-	doicon "${FILESDIR}"/${PN}.png
+	doicon "${WORKDIR}"/${PN}.png
 }
diff --git a/x11-misc/xaos/xaos-3.5-r1.ebuild b/x11-misc/xaos/xaos-3.5-r1.ebuild
index 33d3634268c4..81bf7acc52d6 100644
--- a/x11-misc/xaos/xaos-3.5-r1.ebuild
+++ b/x11-misc/xaos/xaos-3.5-r1.ebuild
@@ -1,21 +1,25 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.5-r1.ebuild,v 1.5 2011/03/02 13:44:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xaos/xaos-3.5-r1.ebuild,v 1.6 2011/06/13 11:42:21 jlec Exp $
+
+EAPI=4
 
-EAPI=2
 inherit eutils autotools
 
 DESCRIPTION="A very fast real-time fractal zoomer"
 HOMEPAGE="http://xaos.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
+	mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc sparc x86"
 IUSE="aalib doc -gtk nls png svga threads X"
 
-RDEPEND="sys-libs/zlib
+RDEPEND="
 	sci-libs/gsl
+	sys-libs/zlib
 	aalib? ( media-libs/aalib )
 	gtk? ( x11-libs/gtk+:2 )
 	png? ( media-libs/libpng )
@@ -25,15 +29,18 @@ RDEPEND="sys-libs/zlib
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	doc? ( virtual/latex-base
+	doc? (
+		virtual/latex-base
 		dev-texlive/texlive-texinfo )
-	X? ( x11-proto/xf86vidmodeproto
-		 x11-proto/xextproto
-		 x11-proto/xproto )"
+	X? (
+		x11-proto/xf86vidmodeproto
+		x11-proto/xextproto
+		x11-proto/xproto )"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4-png.patch
-	epatch "${FILESDIR}"/${PN}-3.4-include.patch
+	epatch \
+		"${FILESDIR}"/${PN}-3.4-png.patch \
+		"${FILESDIR}"/${PN}-3.4-include.patch
 	sed -i -e 's/-s//' Makefile.in
 	eautoreconf
 }
@@ -53,27 +60,26 @@ src_configure() {
 }
 
 src_compile() {
-	emake || die "emake failed"
+	default
 	if use doc; then
 		cd "${S}"/doc
-		emake xaos.dvi || die
+		emake xaos.dvi
 		dvipdf xaos.dvi || die
 		cd "${S}"/help
-		emake html || die
+		emake html
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog* NEWS README AUTHORS
+	default
 	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins doc/xaos.pdf || die
-		dohtml -r help/* || die
+		doins doc/xaos.pdf
+		dohtml -r help/*
 	fi
 	local driver="x11"
 	use gtk && driver="\"GTK+ Driver\""
 	make_desktop_entry "xaos -driver ${driver}" "XaoS Fractal Zoomer" \
 		xaos "Application;Education;Math;Graphics;"
-	doicon "${FILESDIR}"/${PN}.png || die
+	doicon "${WORKDIR}"/${PN}.png
 }