3 files changed, 22 insertions, 120 deletions
diff --git a/sci-mathematics/geomview/ChangeLog b/sci-mathematics/geomview/ChangeLog
index 515a3bbd2e2f..96cd3f82831b 100644
--- a/sci-mathematics/geomview/ChangeLog
+++ b/sci-mathematics/geomview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/geomview
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/ChangeLog,v 1.19 2014/03/25 05:49:23 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/geomview/ChangeLog,v 1.20 2014/11/06 22:58:42 dilfridge Exp $
+
+  06 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  -geomview-1.9.4.ebuild:
+  Drop old EAPI=1 version
 
 *geomview-1.9.5 (25 Mar 2014)
 
diff --git a/sci-mathematics/geomview/Manifest b/sci-mathematics/geomview/Manifest
index 456c469a3410..c103bf2d6c3b 100644
--- a/sci-mathematics/geomview/Manifest
+++ b/sci-mathematics/geomview/Manifest
@@ -3,29 +3,27 @@ Hash: SHA256
 
 AUX 50geomview-gentoo.el 231 SHA256 b109acc005929e40cfe416b45ddea7e5c2831fe47648d4164905c587194a58d9 SHA512 c5d1420dedc078cee78870c48556f5470f384f1fd69c4cb4935ff4f59cbf2a9c17ea6e1dcdbf36149fcc4af2f801cc7420f1a1b0df8d96e14b97eb6439e94986 WHIRLPOOL 57c71c097c91f97e87bccd3eda89aabd7f2756e4667d94341b085b36016363072f8044e8db7ab355948835e419e1f42f5c79b0b5e9146fde5fe94d18b972ad4e
 AUX gvcl-mode.el 7416 SHA256 924325cdd45314b7038c02d1afd1620f5884343b7c5fd8a5bc38a42437d9d811 SHA512 b7f834cc5a3187e4a1fe5342a392d22576aee7f76f95493e02512e3055b1f5e349e170405e6b419c06816470167fc3a063f6f6dee934b35ed4f02f5a3e0a0812 WHIRLPOOL b37892d488384bcf64327e60f95fd69a1539913fad28fbcb9837e9c7072ac9647df74482a3d1fa78a87272c49d665ba85875ea0b27f375adaf3cfd51543c7731
-DIST geomview-1.9.4.tar.bz2 4037982 SHA256 a384790429541b8c86c41c4b27d157d5a92ee7c46e6a78741e55d81bd9a46c5b SHA512 bb584f654b3fbfb5fe317547a0b49270e4419a54d30fe70afbe161d76c0e29ca14c17a6bb44afbfa1fef75f18dfb53287e129a93fa57ab356727dc2dd9671a7f WHIRLPOOL 0c59c5c1e5dd8e2feb6916c5efc8affa1f6b7c82201b912834069b380606ea3dacae547633eabfce7887fbb15edd1e4b5dbe5af3a0455553dedaab2535e5ff1a
 DIST geomview-1.9.5.tar.bz2 4532535 SHA256 6b683735582ac4eab7f2618cf924c1244de58dd3ef195d06442aaea54cd9fb40 SHA512 a22bcd254e1e4c5c6797811f315d158f84fe82a3f95646bfdf3be203e9cd7fc8cacbf26f55a0a08bcb47cf2b2ad17ae4b48cdc4d78f810f48dab9fa1c7d56e7f WHIRLPOOL f89188ba357f814408fd8523ec416aab6052c1fb110110547e3e48a6c2d4bd8aa3d14f9d4995173e38714fa69156940950e2e4266d34685159d6ad35279b67f1
 DIST geomview.png.tar 10240 SHA256 cf1f5b94d868d363fa6f251343b1426cc7e9ed36ed8ee1fea4339ccabcba33cb SHA512 3abdc04f04410a50876af6b0f1aefc6891c47926ca9e5a4a31bd001310972996497f4e6c33db059fdbca09b236b7763e5476d75427e653d54861b4b3a4e54f51 WHIRLPOOL fecc6989bbef303b379673a503c322db1c8bbe61c346bc3dee984319eb29537985f2696c5a716e94398eb873fd6ed77a06e2462b615d7d4f22bad0bb033765a3
-EBUILD geomview-1.9.4.ebuild 2615 SHA256 dc621b2f5ab79d21bdd317dd6688c252ab95c275eb697822633c3bfdf83e85ec SHA512 a88c12d096b49cbad0058a6da9eb6f0791258ac1e939b3cce5b2de6b024f7ddba9b9b68dd4680f558ffda9b1b49ab6e83ca084a61a604853db6fcb8fdf6ab1d8 WHIRLPOOL 82c5cef7057f31a3056daedb68e98481efe45ca1fd280b57c0d42e9b95d927db267a9b4cf0b61d270630776d15630696eb4afe1dcaacf88442f583e50d9d66ba
 EBUILD geomview-1.9.5.ebuild 1638 SHA256 f72324b0f961ea6c25ec7134f7fee684ea3908450a72f8c43bc839b39d983ba6 SHA512 dcb0388335abac14488edb0f7c3ada34a09b5ead282210a079bd46ee30f2422acfc3f2722f611d955cbe01847bd5f5b29f55c9ab571b9e9cbf3b5f2f601e25b4 WHIRLPOOL 4187348d0f2fc25c01eae75f414ea6410a95126b2f7f9c716e60a7aea7eea76181cd88cc68ee7007ec4052ebfa1fca477cfafdb81bd2f06fac6f351469399834
-MISC ChangeLog 4123 SHA256 cd0671d2bd4941ad27bdbcc96897e71b847fe9bcc55a95462a85f0924458998e SHA512 e13c7cb21a58ef3fa5a36a39f993355b23171bf7fc1a1285c6858719fe95fc3200faa4efb39a3af309d0628aacb163cad1e69eeb38364a0224998c170b2cc78a WHIRLPOOL 8d160597d6e8da141f32d1e26f08e08551a6165b4db3b099cad2af48c9c7e7c719e92ba9e822a93ad79d48c05590396606e930c57a6b6095aadb46291d1da9e0
+MISC ChangeLog 4236 SHA256 17a12d2ea704ffd50a460f352d7b844ddf269b3658caaa31a161c819818dc672 SHA512 ffe98d172c47858752cbfd0599f62ec639b260395c6b09e2c17a5438ce7a8ef907f7da3a21df7bf680c5c2902e07e35a814d8b124e6f4f785507d8c90498fc35 WHIRLPOOL df0af546d4ac164cfdfca6d27f1818525ad503daf8b3d6796358e090df34f603bd4dff2aec52295c721bcc3ec97b2598fcb308f85eeb5e2e3f022d3dad7f0766
 MISC metadata.xml 557 SHA256 49b6e651f710d05949a8034e9756d85db51eb4f86f6aca822d50a064cbc8911c SHA512 955fc9dce33ffe5f77b3f342db36d5db8df0c4d368be9a0105b81f74925bb538e47fa729f1091c89e94ef48b8132733c02fe6e660c2d428f14f8023a67907cf7 WHIRLPOOL 45f640d1892caa8347be1142a6ed6f425eef09e852128032140619da700995f89499474bd0c6ab09699d2c3bdd18ca7737afae54492de260fec1170355aea1c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTMRcTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
-QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MHhgP/2LOjF1tUGCtDdD6eqv0bmC6
-d+J4BBBR3HgzHshT1yP3rtftS27ey6wL1y5D/VC+v449dlOnBx8IgECM+w4XE8WE
-ktvNPwmv3pogN19pBqjXgiwl6PuYW4JyG4O0Dww71luFE4eLEFgCu35w7zrUTgHm
-aPYZN/Bpq48d+DGVVr5uejQ4SFFh6buZNDUIBrRKOoDRk7xBDzqnKfxgnoFkT3eN
-Fsd8rHjKTiqi0B5T5dunj+UR0dfYHxXULZvWknVM/W247CZyf6PqOpj/vc9jK8PF
-4OM3/5C1ruzq8eMVZQJeZN3qJf++MzvMOvppyl/NF7WFv7VBZx3sTkZfZhtF3pWj
-515X5EnejrYPUDL3dj42gTClqyfCPo8Wfrms7bGeyqsN9ttvd225yU0HWkaW4ljL
-bYnFBIaGwjsQWcFtLv0VhU8Fv7q+CbUe89KMhRxANaDjyYdolP49APhsi8moCeTR
-XBrsRdyaYTjh+YEv78v5iJUFWmSmsEUYYnse82QpGp2CVB18w2Y50A+tyiexKmZ/
-tFWCXPO2JasQKzM2m4lRU3P4QaBAu5KMisAmvWPURA46AbQHc+fr7wV3qf/iMPOo
-SDU3KJRUPJYprSyYw+It8OQKjNs+t4Dn1KdFvz6HO9YhvddUNd8slLbLNAhqd66W
-EVGrwBXbh8k9DGRz2zHF
-=tzOp
+iQJ8BAEBCABmBQJUW/0jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc6igQAKLsZwizY5AbUdztWlS0KyfH
+1WwhH0rq4BvdgLBJaaWVwbs3HHpyJgYqaf+5l5/0/mbf1OVtP2B8gRqc2H+yDKdv
+QG9Ix22OsAjoDDpcaMC8hEUCVkYp2uFkm5BElKOLCSGgWqE4NW8NnwaTQ2m9Beom
+KZmQtSN1GS1nJTYtTUMjguvw7VJlq9GKTi6r1ViPaYhQALo/fs9cW28g9TYSQaS1
+47RTufiBpKbzb+u6Qicyo1y+nFmwCN6q72T4uZxO6nyQIk3CCZ8Pq7YwsEsNPM7Q
+5RAtcdS7esw1GdFqaWRGHsWy3ZSX+ySC0I98M3ir3kBvjS0AsnaEWy/e+iBxAfKH
+61MRwL/l4O9qqA+7SkfTBqFjNiaRFPD2uPUISDy832Xh8DBkLMhghHVXVw10P5gr
+eadOFZOovGI5f9ag7hgsfKCWZi7v97Qcz7VmGASW1LA9ZO121ueB8voiH42D2rNo
++AHiYUR4hAd+W4E7i0EYWn7WTLinuk5J3gin4PiucYfQq5dVGQ29OSvirzRqnFZQ
+NbefnBoB+4sArvbuApf7E0bopSY8bipxKCrdVhUKglCzh7PctOxQKKZtNxWhQ1w7
+8Jfzl+Mx0RFYd93CEB3kPWMH42RWP7FxKXfCp9ioaYfkHkk5s49czskPDcjBCzLw
+n5kvxeend8zwGe5h9dbW
+=Flml
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/geomview/geomview-1.9.4.ebuild b/sci-mathematics/geomview/geomview-1.9.4.ebuild
deleted file mode 100644
index 2f4db80d7331..000000000000
--- a/sci-mathematics/geomview/geomview-1.9.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2013 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.9 2013/11/11 22:16:29 mr_bones_ Exp $
-
-EAPI=1
-
-inherit elisp-common eutils flag-o-matic fdo-mime
-
-DESCRIPTION="Interactive Geometry Viewer"
-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="
-	>=x11-libs/motif-2.3:0
-	virtual/opengl
-	emacs? ( virtual/emacs )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	app-arch/gzip
-	virtual/w3m
-	bzip2? ( app-arch/bzip2 )
-	netpbm? ( >=media-libs/netpbm-10.37.0 )
-	pdf? (
-		|| ( app-text/xpdf
-			app-text/gv
-			app-text/epdfview
-			app-text/acroread )
-	)"
-
-S="${WORKDIR}/${P/_/-}"
-
-SITEFILE=50${PN}-gentoo.el
-
-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)
-
-	emake || die "make failed"
-
-	if use emacs; then
-		cp "${FILESDIR}/gvcl-mode.el" "${S}"
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	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 || die
-
-	if ! use pdf; then
-		rm "${D}"/usr/share/doc/${PF}/${PN}.pdf || die
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} *.el *.elc|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || \
-			die "elisp-site-file-install failed"
-	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)."
-	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"
-	elog "to setup the \'(ui-pdf-viewer VIEWER)\' GCL-command)."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	use emacs && elisp-site-regen
-}