Mirror binary file and remove it from FILESDIR, #370879; add missing dies; resorted ebuild

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 40 insertions, 126 deletions

diff --git a/sci-mathematics/geomview/ChangeLog b/sci-mathematics/geomview/ChangeLog
index 87d06ffedfc6..d4343073477a 100644
--- a/sci-mathematics/geomview/ChangeLog
+++ b/sci-mathematics/geomview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/geomview
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/ChangeLog,v 1.13 2010/10/10 21:49:01 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/ChangeLog,v 1.14 2012/01/26 17:10:25 jlec Exp $
+
+  26 Jan 2012; Justin Lecher <jlec@gentoo.org> -geomview-1.9.2.ebuild,
+  geomview-1.9.4.ebuild, -files/geomview.png:
+  Mirror binary file and remove it from FILESDIR, #370879; add missing dies;
+  resorted ebuild
 
   10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> geomview-1.9.2.ebuild,
   geomview-1.9.4.ebuild:
diff --git a/sci-mathematics/geomview/Manifest b/sci-mathematics/geomview/Manifest
index 1e65d0edccac..132103c8fee5 100644
--- a/sci-mathematics/geomview/Manifest
+++ b/sci-mathematics/geomview/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 50geomview-gentoo.el 231 RMD160 cabd59f4ea9e0ce768483d0055b6744a726d5273 SHA1 648fb1747d2f14d47431534784b579e2f2693ff1 SHA256 b109acc005929e40cfe416b45ddea7e5c2831fe47648d4164905c587194a58d9
-AUX geomview.png 4078 RMD160 56e8e342976e20e5f173cdeb5ba3eefc2be6b0f9 SHA1 d9b66bcc42d72e11a8d9bdca58a3bcad7f5afff6 SHA256 8ed4c6b4a9a4edb5c7c31346a030a0547563b7e98dc2dc29eefde85fec7b64c2
 AUX gvcl-mode.el 7014 RMD160 772b4f96ca4278402bc39850bbc61f67bb0977d0 SHA1 2de8197f384a2540c307482f7277bec6aa1e531d SHA256 3014bb3990ec5e7afc8389be3527f0a763d3b4fc4d281ac9ff2d087408822b8e
-DIST geomview-1.9.2.tar.bz2 3060421 RMD160 af91598a2ce379df33aefbc018d40f4079891ed5 SHA1 81a11b5e7cd7b003550b90698bd32ac2b220ef5c SHA256 de91ba018fa08626180102d281d8564e5a55329a2a13fef23165504c56200c40
 DIST geomview-1.9.4.tar.bz2 4037982 RMD160 6d53d7e6bce17e3298dc6f55e1e1770918b868a5 SHA1 4d1c2654968c3f2395b438302e163e0465b7e2d3 SHA256 a384790429541b8c86c41c4b27d157d5a92ee7c46e6a78741e55d81bd9a46c5b
-EBUILD geomview-1.9.2.ebuild 2564 RMD160 4ec7e9069a478291cbd4b2b597d8c3dac8419588 SHA1 dd65a784d00178311838cebfcd99e08ff8f51dd0 SHA256 10a09f355632e4e1484c858baa1fcda6e96c19e907029901c1a134cc767f3f59
-EBUILD geomview-1.9.4.ebuild 2580 RMD160 e5a8c071939b871297c401ba438f5281cc37bd15 SHA1 e9eaa842cf58c82269411bb0a78282ba075673fa SHA256 72517c95ee0aa48f4e2f74430be3d11696eb5b3d5e3508b78f7f549746b9e67c
-MISC ChangeLog 3270 RMD160 32a10af3db99ea22eeba37cbc4b19ed8aea13522 SHA1 59c50c3ed5f714f106cfe8d114ddda5577eaace3 SHA256 3a25008328231f054843cbc6ba62373c66880954de90fd3c0bcb28fb716aa779
+DIST geomview.png.tar 10240 RMD160 8f4c23eb8c43cc8d168bba3c5a2f5bd039db7da9 SHA1 c60a21c6cc1b67793a37f631477639e156d567de SHA256 cf1f5b94d868d363fa6f251343b1426cc7e9ed36ed8ee1fea4339ccabcba33cb
+EBUILD geomview-1.9.4.ebuild 2633 RMD160 31fcd08fc3d86d5e2e6e125053ce94ee3e71c258 SHA1 35797aff88576617cd6dbc31c1f1ca4c95213a66 SHA256 da42f66372e86e2210c485a482eb8d45f5d8d5464a61029f8a65e13358e52768
+MISC ChangeLog 3484 RMD160 89801be43d7e6ba99405943cf298a155b04e3018 SHA1 6f9d3e3a669b48dbab20ac52a33982cfc7a690b7 SHA256 fc1c0ef3d1b5135b84ee8e4a1f8f88678ba3a4452353f0021675b7748c785a27
 MISC metadata.xml 611 RMD160 ca51681da73b479cfbfa3caa81631a5de28c130f SHA1 1aa6f1b3a0f0934eb0961374f72437b4ebac00c8 SHA256 f090e8dfad53977f25f870cedf1ea73657851662fb30f9c0da7c22110809a1f4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkyyNUEACgkQOeoy/oIi7uybogCdGDUaDt/GeuE/iBYqigdBVGv5
-ZWYAn0/gt+QU8Mra5eHWUXO7hLk3teJ5
-=fuyT
+iEYEAREKAAYFAk8hiQ4ACgkQgAnW8HDreRZzJwCgqoHi742O/UzH3+FqRqN8iYsv
+YmcAn29FaBTJZOvhAwbw6x2uUF0q8mEZ
+=atAZ
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/geomview/files/geomview.png b/sci-mathematics/geomview/files/geomview.png
deleted file mode 100644
index 5170f1ed7b5c..000000000000
--- a/sci-mathematics/geomview/files/geomview.png
+++ /dev/null
diff --git a/sci-mathematics/geomview/geomview-1.9.2.ebuild b/sci-mathematics/geomview/geomview-1.9.2.ebuild
deleted file mode 100644
index 6821ecb4279c..000000000000
--- a/sci-mathematics/geomview/geomview-1.9.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.9.2.ebuild,v 1.9 2010/10/10 21:49:01 ulm Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic fdo-mime
-
-DESCRIPTION="Interactive Geometry Viewer"
-SRC_URI="http://mesh.dl.sourceforge.net/sourceforge/geomview/${P/_/-}.tar.bz2"
-HOMEPAGE="http://geomview.sourceforge.net"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="avg bzip2 debug emacs netpbm pdf zlib"
-
-DEPEND="zlib? ( sys-libs/zlib )
-	>=x11-libs/openmotif-2.3:0
-	virtual/opengl"
-
-RDEPEND="${DEPEND}
-	netpbm? ( >=media-libs/netpbm-10.37.0 )
-	bzip2? ( app-arch/bzip2 )
-	app-arch/gzip
-	pdf? ( || ( app-text/xpdf
-		app-text/gv
-		app-text/gsview
-		app-text/epdfview
-		app-text/acroread )
-		)
-	virtual/w3m"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_compile() {
-	# GNU standard is /usr/share/doc/${PN}, so override this; also note
-	# that motion averaging is still experimental.
-	if use pdf; then
-		local myconf="--docdir=/usr/share/doc/${PF}"
-	else
-		local myconf="--docdir=/usr/share/doc/${PF} --without-pdfviewer"
-	fi
-
-	econf ${myconf} $(use_enable debug d1debug) $(use_with zlib) \
-		$(use_enable avg motion-averaging) \
-		|| die "could not configure"
-
-	make || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	doicon "${FILESDIR}"/geomview.png
-	make_desktop_entry geomview "GeomView ${PV}" \
-		"/usr/share/pixmaps/geomview.png" \
-		"Science;Math;Education"
-
-	dodoc AUTHORS ChangeLog NEWS INSTALL.Geomview
-
-	if ! use pdf; then
-		rm "${D}"usr/share/doc/${PF}/${PN}.pdf
-	fi
-
-	if use emacs; then
-		insinto /usr/share/geomview
-		doins "${FILESDIR}"/gvcl-mode.el || die
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	elog "GeomView expects you to have both Firefox and Xpdf installed for"
-	elog "viewing the documentation (this can be changed at runtime)."
-	elog ""
-	elog "The w3m virtual should handle the HTML borwser part, and if"
-	elog "you wish to use an alternate PDF viewer, feel free to remove"
-	elog "xpdf and use the viewer of your choice (see the docs for how"
-	elog "to setup the \'(ui-pdf-viewer VIEWER)\' GCL-command)."
-	elog ""
-	elog "If you use emacs, enable the corresponding use flag and check"
-	elog "out the provided mode file for editing the GeomView command"
-	elog "language (courtesy of Claus-Justus Heine).  Incorporating it"
-	elog "into your emacs configuration is left as an exercise..."
-	elog ""
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-mathematics/geomview/geomview-1.9.4.ebuild b/sci-mathematics/geomview/geomview-1.9.4.ebuild
index f55efbc40c67..9a18a8a015c8 100644
--- a/sci-mathematics/geomview/geomview-1.9.4.ebuild
+++ b/sci-mathematics/geomview/geomview-1.9.4.ebuild
@@ -1,38 +1,42 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.9.4.ebuild,v 1.6 2010/10/10 21:49:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/geomview-1.9.4.ebuild,v 1.7 2012/01/26 17:10:25 jlec Exp $
 
 EAPI=1
 
 inherit elisp-common eutils flag-o-matic fdo-mime
 
 DESCRIPTION="Interactive Geometry Viewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://geomview.sourceforge.net"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.bz2
+	http://dev.gentoo.org/~jlec/distfiles/geomview.png.tar"
 
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="avg bzip2 debug emacs netpbm pdf zlib"
 
-DEPEND="zlib? ( sys-libs/zlib )
-	emacs? ( virtual/emacs )
+DEPEND="
 	>=x11-libs/openmotif-2.3:0
-	virtual/opengl"
-
+	virtual/opengl
+	emacs? ( virtual/emacs )
+	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
-	netpbm? ( >=media-libs/netpbm-10.37.0 )
-	bzip2? ( app-arch/bzip2 )
 	app-arch/gzip
-	pdf? ( || ( app-text/xpdf
-		app-text/gv
-		app-text/gsview
-		app-text/epdfview
-		app-text/acroread )
-		)
-	virtual/w3m"
+	virtual/w3m
+	bzip2? ( app-arch/bzip2 )
+	netpbm? ( >=media-libs/netpbm-10.37.0 )
+	pdf? (
+		|| ( app-text/xpdf
+			app-text/gv
+			app-text/gsview
+			app-text/epdfview
+			app-text/acroread )
+	)"
 
 S="${WORKDIR}/${P/_/-}"
+
 SITEFILE=50${PN}-gentoo.el
 
 src_compile() {
@@ -45,8 +49,7 @@ src_compile() {
 	fi
 
 	econf ${myconf} $(use_enable debug d1debug) $(use_with zlib) \
-		$(use_enable avg motion-averaging) \
-		|| die "could not configure"
+		$(use_enable avg motion-averaging)
 
 	emake || die "make failed"
 
@@ -60,15 +63,15 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	doicon "${FILESDIR}"/geomview.png
+	doicon "${WORKDIR}"/geomview.png || die
 	make_desktop_entry geomview "GeomView ${PV}" \
 		"/usr/share/pixmaps/geomview.png" \
 		"Science;Math;Education"
 
-	dodoc AUTHORS ChangeLog NEWS INSTALL.Geomview
+	dodoc AUTHORS ChangeLog NEWS INSTALL.Geomview || die
 
 	if ! use pdf; then
-		rm "${D}"/usr/share/doc/${PF}/${PN}.pdf
+		rm "${D}"/usr/share/doc/${PF}/${PN}.pdf || die
 	fi
 
 	if use emacs; then
@@ -83,7 +86,7 @@ pkg_postinst() {
 
 	elog "GeomView expects you to have both Firefox and Xpdf installed for"
 	elog "viewing the documentation (this can be changed at runtime)."
-	elog ""
+	echo ""
 	elog "The w3m virtual should handle the HTML browser part, and if"
 	elog "you wish to use an alternate PDF viewer, feel free to remove"
 	elog "xpdf and use the viewer of your choice (see the docs for how"