x11-misc/GeoXPlanet: Bump EAPI to 2, added ~amd64 keyword, cleanup. Thanks to Nick Fortino (nfortino) <nfortino@gmail.com>

svn path=/sunrise/; revision=8127

5 files changed, 63 insertions, 61 deletions

diff --git a/x11-misc/GeoXPlanet/ChangeLog b/x11-misc/GeoXPlanet/ChangeLog
index 67ba25863..c8b388aa9 100644
--- a/x11-misc/GeoXPlanet/ChangeLog
+++ b/x11-misc/GeoXPlanet/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for x11-misc/GeoXPlanet
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Mar 2009; Christian Ruppert <idl0r@gentoo.org>
+  -GeoXPlanet-0.4.5-r2.ebuild, +GeoXPlanet-0.4.5-r3.ebuild,
+  -files/GeoXPlanet-0.4.5-r2.patch, +files/GeoXPlanet-0.4.5.patch:
+  Bump EAPI to 2, added ~amd64 keyword, cleanup. Thanks to Nick Fortino
+  (nfortino) <nfortino@gmail.com>
+
   01 Sep 2008; Mike Kazantsev (MK_FG) <mk.fraggod@gmail.com>
   +GeoXPlanet-0.4.5-r2.ebuild, +files/GeoXPlanet-0.4.5-r2.patch,
   +files/geoxplanet, +metadata.xml:
diff --git a/x11-misc/GeoXPlanet/GeoXPlanet-0.4.5-r2.ebuild b/x11-misc/GeoXPlanet/GeoXPlanet-0.4.5-r2.ebuild
deleted file mode 100644
index d670ac440..000000000
--- a/x11-misc/GeoXPlanet/GeoXPlanet-0.4.5-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="Wrapper script to draw traceroutes of current network connections on xplanet images"
-HOMEPAGE="http://geoxplanet.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PF}.zip mirror://sourceforge/${PN}/geoip.db.zip"
-
-LICENSE="GPL-1 MAXMIND"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="xinerama"
-
-RDEPEND="x11-misc/xplanet
-	dev-python/pygtk
-	xinerama? ( media-gfx/imagemagick )
-	|| (
-		( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
-		>=dev-lang/python-2.5
-	)"
-DEPEND="${RDEPEND} app-arch/unzip"
-
-src_unpack() {
-	if has_version ">=dev-lang/python-2.5" && ! built_with_use dev-lang/python sqlite ; then
-		ewarn 	"Python 2.5 or higher (>=dev-lang/python-2.5) must be compiled with the sqlite support."
-		einfo 	"Please emerge python with sqlite USE flag and then emerge GeoXPlanet."
-		die 	"Python doesn't have sqlite support"
-	fi
-
-	unpack ${A}
-	cd "${S}"
-
-	# Originally GeoXPlanet moves temp files (images, config files, etc...) into user's home at first launch
-	# This patch changes move operation to copy
-	epatch "${FILESDIR}/${PF}.patch"
-}
-
-src_install() {
-	dobin "${FILESDIR}/geoxplanet"
-
-	cd "${WORKDIR}"
-	insinto /usr/share/geoxplanet/
-	mv README README.geoip
-	dodoc README.geoip
-	doins geoip.db || die
-	cd "${S}"
-	doins -r arcFiles defaults src temp templates || die
-	insinto /usr/share/geoxplanet/src
-	insopts -m755
-	doins src/GeoXPlanet.py src/configGUI.py || die
-	dodoc CHANGELOG CONFIG_OPTIONS README
-
-	ewarn "GeoXPlanet will show configuration dialog only at first launch, but you can type 'geoxplanet -C' to use it later."
-}
diff --git a/x11-misc/GeoXPlanet/GeoXPlanet-0.4.5-r3.ebuild b/x11-misc/GeoXPlanet/GeoXPlanet-0.4.5-r3.ebuild
new file mode 100644
index 000000000..3b0ee72a1
--- /dev/null
+++ b/x11-misc/GeoXPlanet/GeoXPlanet-0.4.5-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit base
+
+MY_P="${P}-r2_"
+MY_PN="geoxplanet"
+
+DESCRIPTION="Wrapper script to draw traceroutes of current network connections on xplanet images"
+HOMEPAGE="http://geoxplanet.sourceforge.net"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2
+	mirror://sourceforge/${MY_PN}/geoip.db.zip"
+
+LICENSE="GPL-1 MAXMIND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="xinerama"
+
+RDEPEND="x11-misc/xplanet
+	dev-python/pygtk
+	xinerama? ( media-gfx/imagemagick )
+	dev-lang/python[sqlite]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+PATCHES=( "${FILESDIR}/${P}.patch" )
+
+src_install() {
+	local shrdir="/usr/share/${MY_PN}"
+
+	dobin "${FILESDIR}/${MY_PN}" || die
+
+	cd "${WORKDIR}"
+	insinto ${shrdir}
+
+	doins geoip.db || die
+	newdoc README README.geoip || die
+
+	cd "${S}"
+	doins -r arcFiles defaults src temp templates || die
+	fperms 0755 ${shrdir}/src/{GeoXPlanet,configGUI}.py || die
+
+	dodoc CHANGELOG CONFIG_OPTIONS README || die
+}
+
+pkg_postinst() {
+	ewarn "GeoXPlanet will show configuration dialog only at first launch,"
+	ewarn "but you can type 'geoxplanet -C' to use it later."
+}
diff --git a/x11-misc/GeoXPlanet/Manifest b/x11-misc/GeoXPlanet/Manifest
index 63431dafa..4ea906e1a 100644
--- a/x11-misc/GeoXPlanet/Manifest
+++ b/x11-misc/GeoXPlanet/Manifest
@@ -1,7 +1,7 @@
-AUX GeoXPlanet-0.4.5-r2.patch 6789 RMD160 a46a899bc01c0470e20e9395bf40727f027bda23 SHA1 9ecdb675a82bfcedb17cb73d3ba52fd639948444 SHA256 2cce16706ecf02f7e1188e89468ef2aa3995bfed38bbc7b5f34a81817d804918
+AUX GeoXPlanet-0.4.5.patch 6789 RMD160 a46a899bc01c0470e20e9395bf40727f027bda23 SHA1 9ecdb675a82bfcedb17cb73d3ba52fd639948444 SHA256 2cce16706ecf02f7e1188e89468ef2aa3995bfed38bbc7b5f34a81817d804918
 AUX geoxplanet 701 RMD160 be270c12eae336102ad642e4c9fdbfbcf9cc21d0 SHA1 1d2d743d497c40e7845ca0774983fd40c839fc10 SHA256 243693bc2bd7ba1edf4b3728b9ad40dd53608637752e7b89c598dae79f0f650e
-DIST GeoXPlanet-0.4.5-r2.zip 1346651 RMD160 59822c13f5f4a0f7e911c5afa0cb8217e8109354 SHA1 fe953f495407fd07d9a046ae6dc2e59abadd0628 SHA256 80696f38092b466a314d78a624e85adf15fcee1b41069ea7e773a9aeeefdcf7b
+DIST GeoXPlanet-0.4.5-r2_.tar.bz2 1252694 RMD160 22e7f3d5adfb7160f4172bef3b3edebafaf0f041 SHA1 af83c6ddaa989295a6f80fa2c99332bbba0c91e6 SHA256 441c7752a7dd49935f8fca66f88fd140c40abb856e0b0fbe7331d04bb941e776
 DIST geoip.db.zip 63522451 RMD160 38f865d5f25f5519bf3a66c01f8d7ab5f858f593 SHA1 c961fc6074842e399190ede3881d16097638e5ee SHA256 7bb358f8dd2a203fd779bebf517fb0aa63270594438d1b81fd9f001581c8566e
-EBUILD GeoXPlanet-0.4.5-r2.ebuild 1680 RMD160 62ac6de5a8ce50d53246da2f86c7c3678c2fbf2d SHA1 20937b8849e81373acf62f89cf6cc86a146b96a8 SHA256 6f0ab77f750527e1499d41cb60afc6f5d18398dfbe7a8b2ebdc00c0af478625d
-MISC ChangeLog 324 RMD160 05a9f43b3ec382b820377f8112201bcd33daaa5f SHA1 247f9f70445132230f5a82bacf0ee793cf0e8a5a SHA256 46633c7c36e162908a5d22325e2791dd38538634ba03a1fd238ba0a0115c1c39
+EBUILD GeoXPlanet-0.4.5-r3.ebuild 1193 RMD160 c0d8df89d9393ca3686170ef140ff61161693ce6 SHA1 d1944ce7524df8a6c06f6a4edc092b814492066c SHA256 d23d249ca7284026e4f76232185299dcc41d62017b110100a1474ae0517d4427
+MISC ChangeLog 610 RMD160 8ae6f11b6d694892a1ba6007fe9acdf2df8c0dc7 SHA1 1ad0e91ae10ae75a6b4599c9b77a4775569562c3 SHA256 95be21009591b1232f06977e64d98aa36b13221878cae2d4570d28d7dc95497b
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/x11-misc/GeoXPlanet/files/GeoXPlanet-0.4.5-r2.patch b/x11-misc/GeoXPlanet/files/GeoXPlanet-0.4.5.patch
index 16ed61045..16ed61045 100644
--- a/x11-misc/GeoXPlanet/files/GeoXPlanet-0.4.5-r2.patch
+++ b/x11-misc/GeoXPlanet/files/GeoXPlanet-0.4.5.patch