Made python a hard dependency for this version (see bug #279586).

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 20 insertions, 18 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 5e80ba3f6d1d..63a98faf1b26 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.41 2009/07/28 03:22:29 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.42 2009/08/01 17:01:19 nerdboy Exp $
+
+  01 Aug 2009; Steve Arnold <nerdboy@gentoo.org> gpsd-2.39.ebuild:
+  Made python a hard dependency for this version (upstream changes, see 
+  bug #279586).
 
   28 Jul 2009; Steve Arnold <nerdboy@gentoo.org> gpsd-2.39.ebuild:
   Updated build to work around libtool funkiness (see bug #278340).
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 6355fa8d5d45..987991efaffa 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -9,6 +9,6 @@ DIST gpsd-2.38.tar.gz 776598 RMD160 e5c8a05170286fd7aac87c9d182cfdf5a8f6c6b0 SHA
 DIST gpsd-2.39.tar.gz 834649 RMD160 9e643156a71433a02d64284130dff200eb276527 SHA1 d3f33da9f8e789119366ec4781957eed118aa08f SHA256 ee3b2fb403112c3871e7e4fdb915cdc25b020f3208318ba61e9ac37692832a21
 EBUILD gpsd-2.32.ebuild 3401 RMD160 f13804b204afd6e4ef0fadaabc70601721b9f7c5 SHA1 851d86a9eaf1b80777dc171ae61332833d5c29af SHA256 ae1e659d5f9eee39c325e55ca66156d3a8678e022f30b1d0e059d2b1624763ba
 EBUILD gpsd-2.38.ebuild 5405 RMD160 216ee67f760bb433a3673cca9ccc49e915c549c4 SHA1 38f378f09c974ecdc1f0fc270520dbe982921981 SHA256 d0a47f98f21703d0f05059e39c5214540236101d93d58271d8dd655c4f7f3987
-EBUILD gpsd-2.39.ebuild 5213 RMD160 5b2df8601e392e0b9bb71c25644a9946aa692c47 SHA1 fb14289a1fdafc49394fb21a749f4ef31bdb96e2 SHA256 5c9e3336d5d41c3ecccd24a94ea8d06e8db0fade797af8a620a7cd6faf0ad42f
-MISC ChangeLog 8724 RMD160 45351e90706ea1124f5f0cf9043a2c9b022fdf26 SHA1 8cd81664249511c588c969e4c09dd311595f6913 SHA256 28568429986d30c4f3fa490cdc5d0fda38a6b71ade3226719305f2981c9e48a0
+EBUILD gpsd-2.39.ebuild 5080 RMD160 1c302787c837872870f016f7bbbd3b3ce069d777 SHA1 13a8e043fdb05905a58e66d814de12de633f33ff SHA256 d93854ddcf82505438cce85d85ec235df9c4585f763316b2fd01bfec835e35fc
+MISC ChangeLog 8881 RMD160 27be7af50e8e1be4cd54139085a68120469983aa SHA1 e5a012d3ec7ad384a8b0da7d212a0db26e74d9cb SHA256 d5bebededdf3e263c69c9494bb49045f5feee101d04547b925344b781348112f
 MISC metadata.xml 888 RMD160 0eba5567425a4a4f782558810e5c993debc9a4cd SHA1 5698bec7ea6f864fa3cc1c7347445bf1e2490131 SHA256 687e6f5954c47a4c4940f6ef6cdf3f1870207f200bd07c2bd1487dca5ee0ffb9
diff --git a/sci-geosciences/gpsd/gpsd-2.39.ebuild b/sci-geosciences/gpsd/gpsd-2.39.ebuild
index 151362c8601b..769488add857 100644
--- a/sci-geosciences/gpsd/gpsd-2.39.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.39.ebuild,v 1.2 2009/07/28 03:22:29 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.39.ebuild,v 1.3 2009/08/01 17:01:19 nerdboy Exp $
 
 inherit autotools eutils distutils flag-o-matic
 
@@ -12,7 +12,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="dbus garmin minimal ntp ocean python tntc usb X"
+IUSE="dbus garmin minimal ntp ocean tntc usb X"
 
 RDEPEND="X? (
 		x11-libs/libXmu
@@ -25,14 +25,14 @@ RDEPEND="X? (
 		x11-libs/libXpm
 		x11-libs/libXaw
 	)
-	python? ( dev-lang/python )
-
 	dbus? ( >=sys-apps/dbus-0.94
 		>=dev-libs/glib-2.6
 		dev-libs/dbus-glib )
 	ntp? ( net-misc/ntp )
 	usb? ( virtual/dev-manager )
-	sys-libs/ncurses"
+	sys-libs/ncurses
+	dev-lang/python"
+
 
 DEPEND="${RDEPEND}
 	X? (
@@ -66,7 +66,7 @@ src_compile() {
 	local my_conf="--enable-shared --with-pic --enable-static"
 		# --enable-superstar2 is missing a header file
 
-	use python && distutils_python_version
+	distutils_python_version
 
 	if ! use ntp; then
 		my_conf="${my_conf} --disable-pps --disable-ntpshm"
@@ -81,12 +81,12 @@ src_compile() {
 
 		WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
 		$(use_enable dbus) $(use_enable ocean oceanserver) \
-		$(use_enable tntc tnt) $(use_enable python) \
-		$(use_enable garmin garmintxt) || die "econf failed"
+		$(use_enable tntc tnt) $(use_enable garmin garmintxt) \
+		|| die "econf failed"
 	else
 		econf ${my_conf} $(use_enable dbus) $(use_enable tntc tnt) \
-		$(use_enable ocean oceanserver) $(use_enable python) \
-		$(use_enable garmin garmintxt) $(use_with X x) \
+		$(use_enable ocean oceanserver) $(use_with X x) \
+		$(use_enable garmin garmintxt) \
 		|| die "econf failed"
 	fi
 
@@ -126,7 +126,7 @@ src_install() {
 		"${D}usr/share/man/man1/xgps.1.bz2"
 	fi
 
-	use python && distutils_src_install
+	distutils_src_install
 
 	dodoc INSTALL README TODO
 
@@ -135,12 +135,10 @@ src_install() {
 	doins dgpsip-servers gpscap.ini
 
 	if use minimal; then
-		doman gpsctl.1 gpsd.8 gps.1 cgps.1 gpxlogger.1 gpspipe.1
-		use python && doman gpsprof.1
+		doman gpsctl.1 gpsd.8 gps.1 cgps.1 gpxlogger.1 gpspipe.1 gpsprof.1
 	else
 		diropts "-m0644"
-		dobin logextract
-		use python && dobin striplog
+		dobin logextract striplog
 	fi
 }