updated for modular X and added latest release

(Portage version: 2.1_pre4-r1)

8 files changed, 100 insertions, 30 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index f9053dbf7e3b..d14399beea07 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.9 2006/01/15 13:14:13 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.10 2006/02/20 05:50:33 nerdboy Exp $
+
+*gpsd-2.31 (20 Feb 2006)
+*gpsd-2.30-r1 (20 Feb 2006)
+
+  20 Feb 2006; Steve Arnold <nerdboy@gentoo.org> -gpsd-2.30.ebuild,
+  +gpsd-2.30-r1.ebuild, +gpsd-2.31.ebuild, -gpsd-2.29.ebuild:
+  Updated for modular X and added latest release (2.31 finally uses
+  newer dbus API).  Closes bug #122512.
 
   15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> gpsd-2.29.ebuild,
   gpsd-2.30.ebuild:
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 3e82c75887da..cc62ba414c08 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,19 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f5b4c61c22ec2fe5fde338247506e421 ChangeLog 2355
+RMD160 675e8e39bc8723820fb3f1e9b4d5a6d3a6fe784b ChangeLog 2355
+SHA256 86df23827252b571ce8407eb76f516e043e85f6d9e9fd1a6dd01e2d3923f2227 ChangeLog 2355
 MD5 f6622a741ad185c494741151fac6f920 files/40-usb-serial.rules 212
+RMD160 373c62caf5048f360a13313fd7386a44452ee247 files/40-usb-serial.rules 212
+SHA256 ed2436fa838c9bd2f74f8d0c56cb91ebd73a4b93377e7fbefe217f58d379ce70 files/40-usb-serial.rules 212
 MD5 45dc7d436da7eb835597bd28d5f6d292 files/digest-gpsd-2.29 61
-MD5 e8fb5fa1cab2ca71f1b1d0f3179f4370 files/digest-gpsd-2.30 61
+RMD160 c132154fc36e34c9507cdfac8d092ab0aaa0ce14 files/digest-gpsd-2.29 61
+SHA256 8712d7af914195b2caaa889c497307def26c13dbc7dd922b8437340fd7b5203c files/digest-gpsd-2.29 61
+MD5 160ad3c2d83b2b513cda1381caeb6648 files/digest-gpsd-2.30-r1 229
+RMD160 f27868d4d71617e6805e728bf5c6b61a81425f3b files/digest-gpsd-2.30-r1 229
+SHA256 10d1e32d4252b824221bdb9825a7d8aa36b5ced92bc56ac89c96cbb390f2bc92 files/digest-gpsd-2.30-r1 229
+MD5 a01ef15a6e65d35d1b1388c26c3ad333 files/digest-gpsd-2.31 229
+RMD160 2ffcbef3189d54d63c835a8c463f0def3f70cf45 files/digest-gpsd-2.31 229
+SHA256 9cd1f77406b88e4b8f02996bbe72492d208b13982d592aa0c9417957b426398f files/digest-gpsd-2.31 229
 MD5 b84a0fec652fc8df8b533eb160055841 files/gpsd.conf 867
+RMD160 2a6a7f5436ef5769c1518004c2b94da05894020a files/gpsd.conf 867
+SHA256 8b126b24bcbbe4505f2c059bd249a8b764f5065ff7dc1c7ea2a0a2d3ffcafd92 files/gpsd.conf 867
 MD5 56fd36d7f177ce4c229e2d61abcf7d15 files/gpsd.init 949
+RMD160 4378554d1f9f18b0427b7b3dc63e6db1d3c2a338 files/gpsd.init 949
+SHA256 1ec90f55af83dca5ef07cd927920f3350e41b9d1ebd31b39bc3f956abf076689 files/gpsd.init 949
 MD5 79fd1c29bebc3aab8f92caa4159ea858 gpsd-2.29.ebuild 3303
-MD5 6051b704cfc02b1fefc2c189cbe4bc8e gpsd-2.30.ebuild 3289
+RMD160 8c62ebbca6d4d873c788e3399ca6d0a3a34906e0 gpsd-2.29.ebuild 3303
+SHA256 a4461d9ac3951df9350a87e2b6b7bf2c96ae50a22cdff1cf779728eddeca13eb gpsd-2.29.ebuild 3303
+MD5 addf5c57c488e9fc2f07af2af8c79bcd gpsd-2.30-r1.ebuild 3616
+RMD160 b0698744e416c2a282bda0df836c7d7d1a03120b gpsd-2.30-r1.ebuild 3616
+SHA256 8e24704f621b1cadd2d0bd9c39c4d1de93dc3491c1d8543eeb75649cad45d0c1 gpsd-2.30-r1.ebuild 3616
+MD5 0274ef7951bd753c0d5376ffb2bf378a gpsd-2.31.ebuild 3616
+RMD160 2ac0098baaf6cab5920b97541122c68e2cca77be gpsd-2.31.ebuild 3616
+SHA256 4a4d206f257e9132179365a183f23c9b4b723e86f33fb2d78e91c2e91d18f2a1 gpsd-2.31.ebuild 3616
 MD5 78ec9f0a49a5a89267a4b8953d904de9 metadata.xml 420
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDykqwntT9W3vfTuoRAiaFAJ9KDomeMcW/Vib578CGnDxgrIMlOgCeLoA2
-bYGFYK9LmoBEsr4dvxo22Vk=
-=gbB+
------END PGP SIGNATURE-----
+RMD160 622357f000f6db7c03ae91821a849e4fcb8c45be metadata.xml 420
+SHA256 7eabf7b07513a6c1a83ae6e2fc3ac748ad3cefdde87b42d1a5a2149eab1383f8 metadata.xml 420
diff --git a/sci-geosciences/gpsd/files/digest-gpsd-2.29 b/sci-geosciences/gpsd/files/digest-gpsd-2.29
deleted file mode 100644
index 813db3af5ac5..000000000000
--- a/sci-geosciences/gpsd/files/digest-gpsd-2.29
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ff80db0e7d906457e5a7a1b04fcb4ec gpsd-2.29.tar.gz 602411
diff --git a/sci-geosciences/gpsd/files/digest-gpsd-2.30 b/sci-geosciences/gpsd/files/digest-gpsd-2.30
deleted file mode 100644
index ecc5972fc2b2..000000000000
--- a/sci-geosciences/gpsd/files/digest-gpsd-2.30
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dde177174878e8ae6db15f8010da46dd gpsd-2.30.tar.gz 605997
diff --git a/sci-geosciences/gpsd/files/digest-gpsd-2.30-r1 b/sci-geosciences/gpsd/files/digest-gpsd-2.30-r1
new file mode 100644
index 000000000000..c72e154f38b4
--- /dev/null
+++ b/sci-geosciences/gpsd/files/digest-gpsd-2.30-r1
@@ -0,0 +1,3 @@
+MD5 dde177174878e8ae6db15f8010da46dd gpsd-2.30.tar.gz 605997
+RMD160 55805f09d1a33de96122e5ebd96cd6e1ae3bae4f gpsd-2.30.tar.gz 605997
+SHA256 9ae74f2ed87a457b53ae1b0150ec44a82e8bd453b26653249f9cf95e622026e2 gpsd-2.30.tar.gz 605997
diff --git a/sci-geosciences/gpsd/files/digest-gpsd-2.31 b/sci-geosciences/gpsd/files/digest-gpsd-2.31
new file mode 100644
index 000000000000..0fefb471df0e
--- /dev/null
+++ b/sci-geosciences/gpsd/files/digest-gpsd-2.31
@@ -0,0 +1,3 @@
+MD5 1928cc9e2b9a28bb481194f33dc3f9b6 gpsd-2.31.tar.gz 622857
+RMD160 a197dc645a1988ec81a1d9dd3daa74193ba8aae8 gpsd-2.31.tar.gz 622857
+SHA256 d1413255a7add1dc3f6a988d43ac1c890daeeb49417c6efc832220bcd3144381 gpsd-2.31.tar.gz 622857
diff --git a/sci-geosciences/gpsd/gpsd-2.30.ebuild b/sci-geosciences/gpsd/gpsd-2.30-r1.ebuild
index 7157b73691db..de5571cff918 100644
--- a/sci-geosciences/gpsd/gpsd-2.30.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.30-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.30.ebuild,v 1.3 2006/01/15 13:14:13 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.30-r1.ebuild,v 1.1 2006/02/20 05:50:33 nerdboy Exp $
 
 inherit eutils libtool distutils
 
@@ -10,12 +10,27 @@ SRC_URI="http://download.berlios.de/gpsd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~sparc ~arm"
+KEYWORDS=" ~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="X usb dbus"
 
-DEPEND="X? ( virtual/motif
-		virtual/x11
+RDEPEND="X? ( || (
+		( x11-libs/libXmu
+		x11-libs/libXext
+		x11-libs/libXp
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libXpm
+		x11-libs/libXaw )
+		|| (
+		    x11-libs/openmotif
+		    x11-libs/lesstif
+		)
+		( virtual/motif
+			virtual/x11 )
+		)
 	)
 	usb? ( sys-apps/hotplug )
 	dbus? ( ~sys-apps/dbus-0.23.4 )
@@ -24,6 +39,13 @@ DEPEND="X? ( virtual/motif
 	virtual/libc
 	sys-devel/gcc"
 
+DEPEND="${RDEPEND}
+	X? ( || (
+	    ( x11-proto/xproto x11-proto/xextproto )
+		virtual/x11
+	    )
+	)"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -54,7 +76,7 @@ src_install() {
 	    newinitd ${FILESDIR}/gpsd.init gpsd
 	fi
 	if use X ; then
-	    insinto /usr/$(get_libdir)/X11/app-defaults
+	    insinto /etc/X11/app-defaults
 	    newins xgps.ad Xgps
 	    newins xgpsspeed.ad Xgpsspeed
 	fi
@@ -72,7 +94,7 @@ pkg_postinst() {
 	einfo
 	einfo "Different GPS devices require the corresponding kernel options"
 	einfo "to be enabled, such as USB_SERIAL_GARMIN, or a USB serial driver"
-	einfo "for an adapter, such as those that come with Deluo GPS units (eg,"
+	einfo "for an adapter such as those that come with Deluo GPS units (eg,"
 	einfo "USB_SERIAL_PL2303). Straight serial devices should always work,"
 	einfo "even without hotplug support."
 	ewarn
diff --git a/sci-geosciences/gpsd/gpsd-2.29.ebuild b/sci-geosciences/gpsd/gpsd-2.31.ebuild
index 8fad0fabcd97..600638bfd92c 100644
--- a/sci-geosciences/gpsd/gpsd-2.29.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.29.ebuild,v 1.4 2006/01/15 13:14:13 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.31.ebuild,v 1.1 2006/02/20 05:50:33 nerdboy Exp $
 
 inherit eutils libtool distutils
 
@@ -10,21 +10,41 @@ SRC_URI="http://download.berlios.de/gpsd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~sparc ~arm"
+KEYWORDS=" ~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="X usb dbus"
 
-DEPEND="X? ( virtual/motif
-		virtual/x11
+RDEPEND="X? ( || (
+		( x11-libs/libXmu
+		x11-libs/libXext
+		x11-libs/libXp
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libXpm
+		x11-libs/libXaw )
+		|| (
+		    x11-libs/openmotif
+		    x11-libs/lesstif
+		)
+		( virtual/motif
+			virtual/x11 )
+		)
 	)
 	usb? ( sys-apps/hotplug )
-	dbus? ( ~sys-apps/dbus-0.23.4 )
+	dbus? ( >=sys-apps/dbus-0.6* )
 	dev-lang/python
 	app-text/xmlto
 	virtual/libc
 	sys-devel/gcc"
 
-RESTRICT="test"
+DEPEND="${RDEPEND}
+	X? ( || (
+	    ( x11-proto/xproto x11-proto/xextproto )
+		virtual/x11
+	    )
+	)"
 
 src_unpack() {
 	unpack ${A}
@@ -32,9 +52,11 @@ src_unpack() {
 	elibtoolize
 }
 
+RESTRICT="test"
+
 src_compile() {
 	distutils_python_version
-	export MY_ECONF="--with-gnu-ld --with-pic $(use_with X x) $(use_enable dbus)"
+	export MY_ECONF="--with-pic $(use_with X x) $(use_enable dbus)"
 	econf ${MY_ECONF} || die "econf failed"
 	emake LDFLAGS="${LDFLAGS} -lm" || die "emake failed"
 }
@@ -54,7 +76,7 @@ src_install() {
 	    newinitd ${FILESDIR}/gpsd.init gpsd
 	fi
 	if use X ; then
-	    insinto /usr/$(get_libdir)/X11/app-defaults
+	    insinto /etc/X11/app-defaults
 	    newins xgps.ad Xgps
 	    newins xgpsspeed.ad Xgpsspeed
 	fi
@@ -72,7 +94,7 @@ pkg_postinst() {
 	einfo
 	einfo "Different GPS devices require the corresponding kernel options"
 	einfo "to be enabled, such as USB_SERIAL_GARMIN, or a USB serial driver"
-	einfo "for an adapter, such as those that come with Deluo GPS units (eg,"
+	einfo "for an adapter such as those that come with Deluo GPS units (eg,"
 	einfo "USB_SERIAL_PL2303). Straight serial devices should always work,"
 	einfo "even without hotplug support."
 	ewarn