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

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

4 files changed, 32 insertions, 116 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/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"