Fix the live ebuild and convert to distutils-r1.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 26 insertions, 52 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 96f90bbe633a..4f98e0dfff54 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.108 2013/08/24 12:34:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.109 2013/08/25 17:00:54 floppym Exp $
+
+  25 Aug 2013; Mike Gilbert <floppym@gentoo.org> gpsd-9999.ebuild:
+  Fix the live ebuild and convert to distutils-r1.
 
   24 Aug 2013; Agostino Sarubbo <ago@gentoo.org> gpsd-3.9.ebuild:
   Stable for ppc64, wrt bug #468262
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 1c7df5a03ddd..665a2dde7247 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 2.95-disable-strip.patch 382 SHA256 435a6fa9c1ea46befc24af760da9ef96f4a66b9bf98c2b9d5d3f9ba2c72b4080 SHA512 e68243bacb9756d2940a952f81d7cdf3b08c917dabf5a27e1b0b7493fa3fad9401df1b02dd44e4805347213072fbbe4845ddb803b748a19c540cdcc3754472bf WHIRLPOOL fe3ea7e8b3fd56072d638111b2d4e3c37bf81ba31bdb5852a64e1dcecb0a91467ade64f486c39eda9dffdd01ac8c19912a9a7e18dce0d599920857f3cdb954cb
 AUX 2.95-fix-ldflags.patch 721 SHA256 3a93468ca101c876549bdda0a1d129ca5803706e4291f9fc8e7c74d2015ecf5a SHA512 df7ad1697d4f2cd25d52cac0de7e96cc6539319791d86428ea6fa6cced7817e7dc88d12ca37f5f1913fd96e589258e26b3712c01d05666af1c62b1f6373a8d96 WHIRLPOOL 5b2259375a362bd7e2db5168bf18a8cb82bab1ec69407e9f1b9a714b4fe2d965d9c17138389664e9f645026af617f929a0fae2365473151ca177d6e0f483d850
@@ -42,23 +42,13 @@ EBUILD gpsd-3.6.ebuild 4452 SHA256 993f9eb7c4086131600a791079ac88ac0cd7204412aba
 EBUILD gpsd-3.7.ebuild 4632 SHA256 b84369682237063c571645b001f40c60d7de5da53dfa510bc1b94c0746a1a13b SHA512 703e36a2ab8a967fcfe4313050ad2b1d8e32eedcac89cfa72491deeb0c1e3e42c28b5ac5b5394a544acfcce0ee568c5dfa1366508ff9754a589cef09e555111b WHIRLPOOL a5ceaa85bbe12dc4c75f15dfedc70e587f254af24d28a4e9328ea1d29d83c5429cfa511b7a269a005a61890f8edadacbb7d6b8e187699b266881fd9192029506
 EBUILD gpsd-3.8.ebuild 5150 SHA256 6ee13a2fc5af0410b2195113904dcc3b62893ea4764dbe837a4debebbe01bbbb SHA512 6726ed6a738d33cb9988584b08358cb721e88342ac504cde34ca933324c5ce3ee77121e2f9f1885d056b3044a126b0ffc65ddba602c653fd56d03d945bf4d418 WHIRLPOOL 9f8727ffb57d3c1516c57410f47c46ba255add79540611ab4c9213fbaa8cdf54d3be028c2b1fd5b6b67da6d5544c62d512860630e6b3383c2c3811457989bd3b
 EBUILD gpsd-3.9.ebuild 4939 SHA256 956d2e519c8e0351644ccbc84a8748c2fa48e00a7ab360b1e011324027176f75 SHA512 ddf489779fbe344d74025919fa374919056a0d089859b3a4f15c026c1b768e26b219fd54d54f8fb3658728b7e97b25b7f45d03193ed0a61e04e3294f50d32071 WHIRLPOOL 04afc5218c4d91b254278c3e1142f397f6ea0bcc3ec5df52e7d11a1e68c5d3d0e27e0faa0552d7d56f8f0d5fc410644317dd76e35d965409affc098c662f8037
-EBUILD gpsd-9999.ebuild 5152 SHA256 90c89e56342c48cd625679524ea3e3e4d4d114185ab7585eae1844ebfec74c4b SHA512 17088b6f1aed9dee009c99ede53256a4adba6514aaa98610d48da92da1e42e7d020ff464582afe78c0cc36d599c9f9cb7cb1253f843b13b036836194911bed47 WHIRLPOOL adc32a2aa44f5f4a88d765d78d61ae69e205f1b62c9477ff415f4d4384586cb819866df85369cfd88c0e65797e5d3ae97dcd9c9848f291d34c6f12e8afb2e2fa
-MISC ChangeLog 19021 SHA256 ace4ea947cad8d1f488b7f3cce078fd8a3a8cb9d613544d3e84cdb80f0a49f61 SHA512 aa7b62fe525da6810e323074aa2e20ee507c8a8fb91348fac976fe27b4a53e822a06f2da4ea6938f1595d63d6709674832abfbccd482e5006d45db1ba2d9488a WHIRLPOOL cc2bfe4470dadc4c72cc283ba2d814584cf5bedb497d69b4f4b508765b1bf66f4b72a684cf38321cd815cac21c249569a9a2763270e82526618082aad1ca3999
+EBUILD gpsd-9999.ebuild 4899 SHA256 7f58f18ead22d315d15478a52c5e1734b1e6779af4dbdc2dbf137918488c42d1 SHA512 d5ca3d66f8dbcc57cf28a823d2c9ac5d2e58ec0122198f6207fa6b331fd4178e420e69add65f31f1a3b0f80b0381bc3fa2b4b8a04b19d479818d3dab7b734cf2 WHIRLPOOL 09d3999e7b78183f8f4d1eca325f6cd6662401a7d0d0cfb3de4f676d6f63adf9f8f3b37c2d516c05349ad8d50448eea5bb409c49ca6aa1ef50fac775211fb385
+MISC ChangeLog 19144 SHA256 6cfdd8d683d9b930445411a909d04a725b0345401387f26042d19ca3cbcf7372 SHA512 e5558d532d5a6171cd7c0217dfeba9e5fe7e912ddc644c180fe824090e4a01ab3e7095d3635f366531f0a7c8a52fff33a67bb1ced10fd71ee3a79bdf3519fbff WHIRLPOOL b4973aaef41a1da7ad20c2f1f0114d8cebbf38da6463ec65a30f17ff9b41c60d310e5bd8ced074978ac3fe04dbaa997eaa24fd137abdbd23c8ed9898d1f4eb0e
 MISC metadata.xml 736 SHA256 9993f65382c0c6fdca76f6dc814dceb6f2bd010446cd8316f793a2e31f6322b3 SHA512 01ed36d89c34d562578f2aaad1c07c9db27fb29faca64775b44ee9fad111248f5f210e778efd5fb7530b4c9ebdf5778d23bd0922a2ec405243a9aa187c1c40cd WHIRLPOOL 0c7735a3536fea5bbeab753a8d4b06803eec683d650ae56b72ad241cca1ca2ed8c00376faf944f3611f0cae4a8098fa7141bc0dd508e24afda38be6f44703d57
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSGKebAAoJELp701BxlEWfibAP/1tMZ8JVOSq399iuCUA4w8ih
-+8aHmmhIPEL3+zC6u3WAroUgYB7v0dVn5377KRvr9EIegY4AtUS7xOSA/1mr76hn
-BENYej9gMK2vVNOpNN8fL0mb2Q4TLd1cENRZmVAgAxFD2PSf6m+b5JWjK4aGelDX
-ezQ94sJhnWonRJgfx506/F6ssRZyvWXhZ3NC9w7OeveONDVZVveLrJp+l4zMmT3e
-C/dXZn5gNMSFRAm7QLXgUbaxuxXlaXhwmgpD9JcKcD3UDyl1XZ6V24Rp2xahDfwU
-SUpcrBafZEKEbcoOZwC9XZPXBSraCs3xQJWgul7CheG2R+PGIHVsABcnB0anUqYX
-F1od9u1cfFz2Ri9ovpUQlX5+WMbypry9KR0cO2v+7Npk656WDgHah2odELxIAZq0
-UiabsF6hmhw9N9ZZH6FIvHaQrEkV0JUwL9sjqAKy1QVNOyYPbeWWg7w8V/Ki/Bzf
-Xe/IWVL2+oi5dLPQN9gb0GfQfAriMzdSy1EkVZKtY/K0QVWFRpyANOeqVNwN4Qqu
-dGN87bpv0XJbHALXgKGoBDA1rbhKgV8UCvgo8J8/FuHlMhYKi0DINdd380WJCeqq
-wWZKXMQRh5ZmVDtgjD8Lnfsya/VH+SoPijnR+2rrS6VwpJVySRmPNOA0ItUwyrve
-6QN5jnndqanGg7X5sRPA
-=r78i
+iF4EAREIAAYFAlIaOEgACgkQC77qH+pIQ6TRhgEAuaBG+ByT77JjK8lnDiAlXNhP
+UDbs6e15fn6RGQEgy48A+gO5z7CRtg7IsRUf/4VyGoUOyGFwGb7JW4nABuztqSEM
+=+8yL
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 0bfebe0e453f..a4cc18f68dc3 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.12 2013/03/30 20:37:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.13 2013/08/25 17:00:54 floppym Exp $
 
-EAPI="4"
+EAPI="5"
 
-PYTHON_DEPEND="python? 2:2.6"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_6,2_7} )
 SCONS_MIN_VERSION="1.2.1"
 
-inherit eutils udev user multilib distutils scons-utils toolchain-funcs
+inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
@@ -34,9 +33,10 @@ GPSD_PROTOCOLS=(
 IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
 IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets test udev usb X"
 REQUIRED_USE="X? ( python )
-	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )"
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="X? ( dev-python/pygtk:2 )
+RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
 	ncurses? ( sys-libs/ncurses )
 	bluetooth? ( net-wireless/bluez )
 	usb? ( virtual/libusb:1 )
@@ -45,7 +45,8 @@ RDEPEND="X? ( dev-python/pygtk:2 )
 		dev-libs/dbus-glib
 	)
 	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
-	qt4? ( dev-qt/qtgui:4 )"
+	qt4? ( dev-qt/qtgui:4 )
+	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? ( sys-devel/bc )"
@@ -57,13 +58,7 @@ if [[ ${PV} == "9999" ]] ; then
 		=app-text/docbook-xml-dtd-4.1*"
 fi
 
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_unpack() {
-	default
-
+src_prepare() {
 	# Make sure our list matches the source.
 	local src_protocols=$(echo $(
 		sed -n '/GPS protocols/,/Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
@@ -73,16 +68,13 @@ src_unpack() {
 		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
 		die "please sync ebuild & source"
 	fi
-}
 
-src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
 	epatch "${FILESDIR}"/${PN}-3.8-libgps.patch
 	epatch "${FILESDIR}"/${PN}-3.8-udev.patch
 	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
 	epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
 	epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760
-	epatch "${FILESDIR}"/${PN}-3.8-no-export-t.patch #463850
 
 	# Avoid useless -L paths to the install dir
 	sed -i \
@@ -106,7 +98,7 @@ src_prepare() {
 			-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
 			-e "s|@SCRIPTS@|$(pyvar python_progs)|" \
 			"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
-		distutils_src_prepare
+		distutils-r1_src_prepare
 	fi
 }
 
@@ -148,7 +140,7 @@ src_compile() {
 	export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
 	escons
 
-	use python && distutils_src_compile
+	use python && distutils-r1_src_compile
 }
 
 src_install() {
@@ -158,13 +150,10 @@ src_install() {
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd
 
 	if use python ; then
-		distutils_src_install
+		distutils-r1_src_install
 		# Delete all X related packages if user doesn't want them
 		if ! use X ; then
-			local p
-			for p in $(grep -Il 'import .*pygtk' *) ; do
-				find "${D}"/usr/bin -name "${p}*" -delete
-			done
+			rm "${ED%/}"/usr/bin/xgps* || die
 		fi
 	fi
 }
@@ -174,11 +163,3 @@ pkg_preinst() {
 	# as it doesn't seem to be needed during compile/install ...
 	enewuser gpsd -1 -1 -1 "uucp"
 }
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}