No binaryfiles in VCS please, #370869

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

4 files changed, 42 insertions, 26 deletions

diff --git a/sci-astronomy/ds9/ChangeLog b/sci-astronomy/ds9/ChangeLog
index bcf836a61e4d..6fc58eed15e2 100644
--- a/sci-astronomy/ds9/ChangeLog
+++ b/sci-astronomy/ds9/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/ds9
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ChangeLog,v 1.23 2010/01/29 18:09:11 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ChangeLog,v 1.24 2011/06/13 11:47:24 jlec Exp $
+
+  13 Jun 2011; Justin Lecher <jlec@gentoo.org> -files/ds9.png,
+  ds9-5.7-r2.ebuild, ds9-6.0.ebuild:
+  No binaryfiles in VCS please, #370869
 
 *ds9-6.0 (29 Jan 2010)
 
diff --git a/sci-astronomy/ds9/ds9-5.7-r2.ebuild b/sci-astronomy/ds9/ds9-5.7-r2.ebuild
index a0a8e8fbcbc3..e83a76290402 100644
--- a/sci-astronomy/ds9/ds9-5.7-r2.ebuild
+++ b/sci-astronomy/ds9/ds9-5.7-r2.ebuild
@@ -1,18 +1,24 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.7-r2.ebuild,v 1.1 2009/11/25 07:32:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.7-r2.ebuild,v 1.2 2011/06/13 11:47:24 jlec Exp $
 
 EAPI=2
+
 inherit eutils
 
 DESCRIPTION="Data visualization application for astronomical FITS images"
 HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
-SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/source/${PN}.${PV}.tar.gz"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
+	http://hea-www.harvard.edu/saord/download/${PN}/source/${PN}.${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND="dev-tcltk/blt
+
+RDEPEND="
+	dev-tcltk/blt
 	>=dev-tcltk/tcllib-1.10
 	>=dev-tcltk/tclxml-3.1
 	dev-tcltk/tkcon
@@ -24,7 +30,6 @@ RDEPEND="dev-tcltk/blt
 	x11-libs/xpa
 	sci-astronomy/ast
 	sci-astronomy/funtools"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -33,12 +38,13 @@ S="${WORKDIR}/sao${PN}"
 src_prepare() {
 	# some patches are adapted from fedora
 	# most of them are to use system libraries instead of bundled-ones
-	epatch "${FILESDIR}"/${PN}-5.4-htmlwidget.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-src.patch
-	epatch "${FILESDIR}"/${P}-main.patch
-	epatch "${FILESDIR}"/${P}-saotk.patch
-	epatch "${FILESDIR}"/${P}-tcl85.patch
+	epatch \
+		"${FILESDIR}"/${PN}-5.4-htmlwidget.patch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-src.patch \
+		"${FILESDIR}"/${P}-main.patch \
+		"${FILESDIR}"/${P}-saotk.patch \
+		"${FILESDIR}"/${P}-tcl85.patch
 
 	# remove build-time dependency on etags (i.e. emacs or xemacs)
 	sed -i -e '/^all/s/TAGS//' saotk/*/Makefile || die "sed failed"
@@ -59,6 +65,6 @@ src_install () {
 	doins -r ds9/zipdir/zvfsmntpt/* || die
 	dodoc README acknowledgement || die "failed installing basic doc"
 	dosym  ../../${PN}/doc /usr/share/doc/${PF}/html
-	doicon "${FILESDIR}"/${PN}.png
+	doicon "${WORKDIR}"/${PN}.png
 	make_desktop_entry ds9 "SAOImage DS9"
 }
diff --git a/sci-astronomy/ds9/ds9-6.0.ebuild b/sci-astronomy/ds9/ds9-6.0.ebuild
index 05bbc974fd97..05c25aa45e95 100644
--- a/sci-astronomy/ds9/ds9-6.0.ebuild
+++ b/sci-astronomy/ds9/ds9-6.0.ebuild
@@ -1,18 +1,24 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-6.0.ebuild,v 1.1 2010/01/29 18:09:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-6.0.ebuild,v 1.2 2011/06/13 11:47:24 jlec Exp $
 
 EAPI=2
+
 inherit eutils
 
 DESCRIPTION="Data visualization application for astronomical FITS images"
 HOMEPAGE="http://hea-www.harvard.edu/RD/ds9"
-SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/source/${PN}.${PV}.tar.gz"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar
+	http://hea-www.harvard.edu/saord/download/${PN}/source/${PN}.${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND="dev-tcltk/blt
+
+RDEPEND="
+	dev-tcltk/blt
 	>=dev-tcltk/tcllib-1.10
 	>=dev-tcltk/tclxml-3.1
 	dev-tcltk/tkcon
@@ -24,7 +30,6 @@ RDEPEND="dev-tcltk/blt
 	x11-libs/xpa
 	sci-astronomy/ast
 	sci-astronomy/funtools"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -33,12 +38,13 @@ S="${WORKDIR}/sao${PN}"
 src_prepare() {
 	# some patches are adapted from fedora
 	# most of them are to use system libraries instead of bundled-ones
-	epatch "${FILESDIR}"/${PN}-5.4-htmlwidget.patch
-	epatch "${FILESDIR}"/${PN}-5.7-makefile.patch
-	epatch "${FILESDIR}"/${PN}-5.7-src.patch
-	epatch "${FILESDIR}"/${PN}-6.0-main.patch
-	epatch "${FILESDIR}"/${PN}-5.7-saotk.patch
-	epatch "${FILESDIR}"/${PN}-5.7-tcl85.patch
+	epatch \
+		"${FILESDIR}"/${PN}-5.4-htmlwidget.patch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-src.patch \
+		"${FILESDIR}"/${P}-main.patch \
+		"${FILESDIR}"/${P}-saotk.patch \
+		"${FILESDIR}"/${P}-tcl85.patch
 
 	# remove build-time dependency on etags (i.e. emacs or xemacs)
 	sed -i -e '/^all/s/TAGS//' saotk/*/Makefile || die "sed failed"
@@ -59,6 +65,6 @@ src_install () {
 	doins -r ds9/zipdir/zvfsmntpt/* || die
 	dodoc README acknowledgement || die "failed installing basic doc"
 	dosym  ../../${PN}/doc /usr/share/doc/${PF}/html
-	doicon "${FILESDIR}"/${PN}.png
+	doicon "${WORKDIR}"/${PN}.png
 	make_desktop_entry ds9 "SAOImage DS9"
 }
diff --git a/sci-astronomy/ds9/files/ds9.png b/sci-astronomy/ds9/files/ds9.png
deleted file mode 100644
index 875195e75f1a..000000000000
--- a/sci-astronomy/ds9/files/ds9.png
+++ /dev/null