Change dependency from virtual/motif to x11-libs/openmotif, bug 224749.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686

7 files changed, 128 insertions, 123 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index daaae213330a..4a5c2208cb8f 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.32 2008/06/02 20:01:03 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.33 2008/06/27 10:31:15 ulm Exp $
+
+  27 Jun 2008; Ulrich Mueller <ulm@gentoo.org> gpsd-2.32.ebuild,
+  gpsd-2.33-r1.ebuild, gpsd-2.34-r1.ebuild, gpsd-2.36.ebuild,
+  gpsd-2.37.ebuild:
+  Change dependency from virtual/motif to x11-libs/openmotif, bug 224749.
 
 *gpsd-2.37 (02 Jun 2008)
 
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 3ddfa0b92af9..99e756a5e1af 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -12,17 +12,17 @@ DIST gpsd-2.33.tar.gz 639348 RMD160 175b90cb8dda1d85964078a4f14cec84b0cc4885 SHA
 DIST gpsd-2.34.tar.gz 668063 RMD160 cefe9f08c8164597bd04e51622d2175a40781bdb SHA1 96d8ab99445dc68136e4ee3622a58f4c464f7510 SHA256 39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8
 DIST gpsd-2.36.tar.gz 736220 RMD160 aa3c4741dba4c07f145f62fb027e2ba303d16284 SHA1 4faee0e3e1e5422702f354a85849fd4e8c3a98c2 SHA256 0c9bf796b932dab2baab70829780eccde4113c08ce649768facd5010d6da640a
 DIST gpsd-2.37.tar.gz 712943 RMD160 72387ef3c8da39ed1a1dffa9aecfff1622023fcc SHA1 5bf4e1db9e570cc14b70bd0cf902926f96131ace SHA256 8860e61edc26f0665ad6ea0b34be4e3fd2cc7c51c5fd63b25c857a1870e8e137
-EBUILD gpsd-2.32.ebuild 3477 RMD160 9d492880e957694dd7bafab430ae3860d9c97ea5 SHA1 7e9514c9d7c47df24af9587d3f7f017167108529 SHA256 9f88d46c4c02f735487c8733f8a1c85aefff5a077dc5e3c7ba66ba7fd0440e90
-EBUILD gpsd-2.33-r1.ebuild 3887 RMD160 5c4a44b4d6d31aad385de5af8c5030614407de51 SHA1 18b000ed74b71660fb3385451c810576849f9fa9 SHA256 3076d31677ae8ea7cb9e2ff539cbcaf3416c5a722a3ed1bc3958c63c94586ea0
-EBUILD gpsd-2.34-r1.ebuild 4354 RMD160 9e41f4dbade25676f191db83bc607938e1538ca3 SHA1 2b6939674f6ee82b8dd8e4081781f1500bb041d5 SHA256 45ecac9a0680bc160fe021fdef5a32dff343567cf931ed2450b30a6e04bc642e
-EBUILD gpsd-2.36.ebuild 4605 RMD160 8e0d57ad3965e3a91cd8bb49c85abe663c09ffe1 SHA1 bffadc55ff14f8b349992433877dc36deae1bc2d SHA256 5efb34078722226787254d243b0a0e9f8a8ccad05a79da5e2c40c8916f630fe0
-EBUILD gpsd-2.37.ebuild 4469 RMD160 d3cc5b0b33fd484cd33c43f04c073547ef9e9474 SHA1 e24074347867df47544462f4539a27689696dcb9 SHA256 3685033d93a36f102f775bbb1bcb8dccedb5c63c45d31901feafe4a793f3f231
-MISC ChangeLog 6747 RMD160 3ab04c7b54af1ffd626aa50a0d80455a8852a57c SHA1 a4e1a1fcfe4b1f7722f4cb2cb3319442b9bcb0e4 SHA256 16afb68bb1d0d43a43594a2ad2f11d016f3b0c161b63a56f39acd9c99f943629
+EBUILD gpsd-2.32.ebuild 3451 RMD160 091a40e66cf45a5dbf388f6e6181f20461da1f1c SHA1 a36953ce1c5334ae269245c9ba197d5074a755e4 SHA256 e9b8e3913e07b1143bb03bf3f6975884b5826a5b37d6305a8d35caa6aa41b93d
+EBUILD gpsd-2.33-r1.ebuild 3849 RMD160 4ffd2c45b44a64c5025aae8cf0e74cf524d3512d SHA1 6098cf056cf8a32af2adc6a6334f4ab3a6487828 SHA256 058aef0e76c9e4108ec53840d70de2636e91cae018297fbfa454addb6cc5fc6a
+EBUILD gpsd-2.34-r1.ebuild 4283 RMD160 1f2e1bafc6972a2620fcd2f5f45ac20259527673 SHA1 db5050d818733bd7ec3fae8ad8ca2988c352d385 SHA256 31230a8918bea75ec54038cfd8fc09503be2c5110482f1aa6a878f28be868fe1
+EBUILD gpsd-2.36.ebuild 4528 RMD160 a21b2ff05d2f239f384c31f229afb08b85446d9a SHA1 e4843c46473e117b1e78922f8398ae0e8b8d332a SHA256 47c69f904c117ad7107ecba137a1722d1581184c7d7961002865614e38ecfccf
+EBUILD gpsd-2.37.ebuild 4391 RMD160 abb5892b31c2f1ea950ee6ded3c8f48226e751f4 SHA1 8ea7dea954415954ab39a92d786f06b595e5e24b SHA256 059a8f2c17fa50077bb85f7b98f24de64799a91fdc1e798f2fe3529a2866538f
+MISC ChangeLog 6967 RMD160 8751fc8f8894bff825d87722c45abfbe34a404ea SHA1 75c7aad826305722a2f396002c3f132470c904a3 SHA256 2aa14dc9d0e610145237d2a344fe26ad84c2fbf34ffc319b3d3ce985571a8bb3
 MISC metadata.xml 432 RMD160 5af3627f9b65a58e04c58e031fcc8d911aa9d9e1 SHA1 548e9d03dacdcc4beac0d58deac74e40b9dc96e1 SHA256 5076d78647d5149ffa3fb8795e8736a785929ae0c218d80938df272a1a57b14b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkhEUYYACgkQr2QksT29OyDx6QCeMnVfd6zm2vR8/aNVVRGjz7Vw
-v9MAn2SviwI1msOlyhs4deo5DIzXCe4L
-=jr+s
+iEYEARECAAYFAkhkwaUACgkQOeoy/oIi7uwOoACfVYClZMSYgpPTl5bzA/5fMDB3
+3NgAoOccPsvFObnNVdR9M052XAeo6Rv1
+=czzy
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/gpsd-2.32.ebuild b/sci-geosciences/gpsd/gpsd-2.32.ebuild
index 668347577072..5904a5217720 100644
--- a/sci-geosciences/gpsd/gpsd-2.32.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.32.ebuild,v 1.6 2008/05/06 16:51:51 djay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.32.ebuild,v 1.7 2008/06/27 10:31:15 ulm Exp $
 
 inherit eutils libtool distutils
 
@@ -24,7 +24,7 @@ RDEPEND="X? (
 		x11-libs/libICE
 		x11-libs/libXpm
 		x11-libs/libXaw
-		virtual/motif
+		x11-libs/openmotif
 	)
 	usb? ( sys-apps/hotplug )
 	dbus? ( >=sys-apps/dbus-0.6 )
@@ -59,19 +59,19 @@ src_install() {
 	make DESTDIR="${D}" install
 
 	if use usb ; then
-	    sed -i -e "s/gpsd.hotplug/gpsd/g" gpsd.hotplug gpsd.usermap
-	    insinto /etc/hotplug/usb
-	    doins gpsd.usermap
-	    exeinto /etc/hotplug/usb
-	    newexe gpsd.hotplug gpsd
+		sed -i -e "s/gpsd.hotplug/gpsd/g" gpsd.hotplug gpsd.usermap
+		insinto /etc/hotplug/usb
+		doins gpsd.usermap
+		exeinto /etc/hotplug/usb
+		newexe gpsd.hotplug gpsd
 	else
-	    newconfd "${FILESDIR}"/gpsd.conf gpsd
-	    newinitd "${FILESDIR}"/gpsd.init gpsd
+		newconfd "${FILESDIR}"/gpsd.conf gpsd
+		newinitd "${FILESDIR}"/gpsd.init gpsd
 	fi
 	if use X ; then
-	    insinto /etc/X11/app-defaults
-	    newins xgps.ad Xgps
-	    newins xgpsspeed.ad Xgpsspeed
+		insinto /etc/X11/app-defaults
+		newins xgps.ad Xgps
+		newins xgpsspeed.ad Xgpsspeed
 	fi
 	dobin logextract
 	diropts "-m0644"
diff --git a/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild
index bf89e1cdcc1f..fd072cf2fa17 100644
--- a/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild,v 1.5 2008/05/06 16:51:51 djay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.33-r1.ebuild,v 1.6 2008/06/27 10:31:15 ulm Exp $
 
 inherit eutils libtool distutils
 
@@ -24,7 +24,7 @@ RDEPEND="X? (
 		x11-libs/libICE
 		x11-libs/libXpm
 		x11-libs/libXaw
-		virtual/motif
+		x11-libs/openmotif
 	)
 	dev-lang/python
 	app-text/xmlto
@@ -55,17 +55,17 @@ src_compile() {
 	local my_conf="--enable-shared"
 
 	if ! use static; then
-	    my_conf="${my_conf} --with-pic --disable-static"
+		my_conf="${my_conf} --with-pic --disable-static"
 	else
-	    my_conf="${my_conf} --enable-static"
+		my_conf="${my_conf} --enable-static"
 	fi
 
 	if ! use ntp; then
-	    my_conf="${my_conf} --disable-ntpshm"
+		my_conf="${my_conf} --disable-ntpshm"
 	fi
 
 	econf ${my_conf} $(use_enable dbus) $(use_enable tntc tnt) \
-	    $(use_with X x) || die "econf failed"
+		$(use_with X x) || die "econf failed"
 
 	emake LDFLAGS="${LDFLAGS} -lm" || die "emake failed"
 }
@@ -74,20 +74,20 @@ src_install() {
 	make DESTDIR="${D}" install
 
 	if use usb ; then
-	    sed -i -e "s/gpsd.hotplug/gpsd/g" gpsd.hotplug gpsd.usermap
-	    insinto /etc/hotplug/usb
-	    doins gpsd.usermap
-	    exeinto /etc/hotplug/usb
-	    newexe gpsd.hotplug gpsd
+		sed -i -e "s/gpsd.hotplug/gpsd/g" gpsd.hotplug gpsd.usermap
+		insinto /etc/hotplug/usb
+		doins gpsd.usermap
+		exeinto /etc/hotplug/usb
+		newexe gpsd.hotplug gpsd
 		keepdir /var/run/usb # needed for REMOVER
 	else
-	    newconfd "${FILESDIR}"/gpsd.conf gpsd
-	    newinitd "${FILESDIR}"/gpsd.init gpsd
+		newconfd "${FILESDIR}"/gpsd.conf gpsd
+		newinitd "${FILESDIR}"/gpsd.init gpsd
 	fi
 	if use X ; then
-	    insinto /etc/X11/app-defaults
-	    newins xgps.ad Xgps
-	    newins xgpsspeed.ad Xgpsspeed
+		insinto /etc/X11/app-defaults
+		newins xgps.ad Xgps
+		newins xgpsspeed.ad Xgpsspeed
 	fi
 	dobin logextract
 	diropts "-m0644"
diff --git a/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild
index 7b62cba1542b..bc00ebd91155 100644
--- a/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild,v 1.5 2008/05/17 18:27:15 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.34-r1.ebuild,v 1.6 2008/06/27 10:31:15 ulm Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF=2.5
@@ -27,7 +27,7 @@ RDEPEND="X? (
 		x11-libs/libICE
 		x11-libs/libXpm
 		x11-libs/libXaw
-		virtual/motif
+		x11-libs/openmotif
 	)
 	python? ( dev-lang/python )
 	dbus? ( >=sys-apps/dbus-0.94
@@ -57,29 +57,29 @@ src_compile() {
 	local my_conf="--enable-shared"
 
 	if ! use static; then
-	    my_conf="${my_conf} --with-pic --disable-static"
+		my_conf="${my_conf} --with-pic --disable-static"
 	else
-	    my_conf="${my_conf} --enable-static"
+		my_conf="${my_conf} --enable-static"
 	fi
 
 	if ! use ntp; then
-	    my_conf="${my_conf} --disable-ntpshm"
+		my_conf="${my_conf} --disable-ntpshm"
 	fi
 
 	if use minimal; then
-	    local max_clients="5"
-	    local max_devices="1"
-	    my_conf="${my_conf} --enable-squelch --disable-pps"
-	    my_conf="${my_conf}  --enable-max-clients=${max_clients} \
+		local max_clients="5"
+		local max_devices="1"
+		my_conf="${my_conf} --enable-squelch --disable-pps"
+		my_conf="${my_conf}  --enable-max-clients=${max_clients} \
 		--enable-max-devices=${max_devices}"
 
-	    WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
+		WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
 		$(use_enable dbus) $(use_with X x) \
 		$(use_enable tntc tnt) $(use_enable italk) \
 		$(use_enable itrax) $(use_enable python) \
 		|| die "econf failed"
 	else
-	    econf ${my_conf} $(use_enable dbus) $(use_with X x) \
+		econf ${my_conf} $(use_enable dbus) $(use_with X x) \
 		$(use_enable tntc tnt) $(use_enable italk) \
 		$(use_enable itrax) $(use_enable python) \
 		|| die "econf failed"
@@ -93,22 +93,22 @@ src_install() {
 	make DESTDIR="${D}" install
 
 	if use usb ; then
-	    insinto /etc/hotplug/usb
-	    doins gpsd.usermap
-	    exeinto /etc/hotplug/usb
-	    doexe gpsd.hotplug
-	    keepdir /var/run/usb # needed for REMOVER
+		insinto /etc/hotplug/usb
+		doins gpsd.usermap
+		exeinto /etc/hotplug/usb
+		doexe gpsd.hotplug
+		keepdir /var/run/usb # needed for REMOVER
 	else
-	    newconfd "${FILESDIR}"/gpsd.conf gpsd
-	    newinitd "${FILESDIR}"/gpsd.init gpsd
+		newconfd "${FILESDIR}"/gpsd.conf gpsd
+		newinitd "${FILESDIR}"/gpsd.init gpsd
 	fi
 
 	if use X ; then
-	    insinto /etc/X11/app-defaults
-	    newins xgps.ad Xgps
-	    newins xgpsspeed.ad Xgpsspeed
+		insinto /etc/X11/app-defaults
+		newins xgps.ad Xgps
+		newins xgpsspeed.ad Xgpsspeed
 	else
-	    rm "${D}usr/share/man/man1/xgpsspeed.1.bz2" \
+		rm "${D}usr/share/man/man1/xgpsspeed.1.bz2" \
 		"${D}usr/share/man/man1/xgps.1.bz2"
 	fi
 
@@ -116,13 +116,13 @@ src_install() {
 	diropts "-m0644"
 
 	if use python ; then
-	    exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
-	    doexe gps.py gpsfake.py gpspacket.so
+		exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
+		doexe gps.py gpsfake.py gpspacket.so
 	fi
 
 	if use minimal; then
-	    doman gpsctl.1 gpsflash.1 gpspipe.1 gps.1 gpsd.8
-	    use python && doman gpsprof.1 gpsfake.1 gpscat.1
+		doman gpsctl.1 gpsflash.1 gpspipe.1 gps.1 gpsd.8
+		use python && doman gpsprof.1 gpsfake.1 gpscat.1
 	fi
 
 	dodoc AUTHORS INSTALL README TODO
diff --git a/sci-geosciences/gpsd/gpsd-2.36.ebuild b/sci-geosciences/gpsd/gpsd-2.36.ebuild
index 8b0ee4daac66..7073f21fd4be 100644
--- a/sci-geosciences/gpsd/gpsd-2.36.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.36.ebuild,v 1.3 2008/05/06 19:08:58 djay Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.36.ebuild,v 1.4 2008/06/27 10:31:15 ulm Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF=2.5
@@ -28,7 +28,7 @@ RDEPEND="X? (
 		x11-libs/libICE
 		x11-libs/libXpm
 		x11-libs/libXaw
-		virtual/motif
+		x11-libs/openmotif
 	)
 	python? ( dev-lang/python )
 
@@ -59,33 +59,33 @@ src_unpack() {
 src_compile() {
 
 	local my_conf="--enable-shared --with-pic --enable-static \
-	    --disable-garmin --disable-garmintxt"
+		--disable-garmin --disable-garmintxt"
 	# Garmin support is broken in this version
 
 	use python && distutils_python_version
 
 	if use ntp; then
-	    my_conf="${my_conf} --enable-ntpshm --enable-pps"
+		my_conf="${my_conf} --enable-ntpshm --enable-pps"
 	else
-	    my_conf="${my_conf} --disable-ntpshm --disable-pps"
+		my_conf="${my_conf} --disable-ntpshm --disable-pps"
 	fi
 
 	if use minimal; then
-	    local max_clients="5"
-	    local max_devices="2"
-	    if ! use ntp; then
+		local max_clients="5"
+		local max_devices="2"
+		if ! use ntp; then
 		my_conf="${my_conf} --disable-pps"
-	    fi
-	    my_conf="${my_conf} --enable-squelch --without-x \
+		fi
+		my_conf="${my_conf} --enable-squelch --without-x \
 		--enable-max-devices=${max_devices} \
 		--enable-max-clients=${max_clients}"
 
-	    WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
+		WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
 		$(use_enable dbus) $(use_enable italk) \
 		$(use_enable itrax) $(use_enable python) \
 		|| die "econf failed"
 	else
-	    econf ${my_conf} $(use_enable dbus) $(use_enable italk) \
+		econf ${my_conf} $(use_enable dbus) $(use_enable italk) \
 		$(use_enable itrax) $(use_enable python) $(use_with X x) \
 		|| die "econf failed"
 	fi
@@ -100,24 +100,24 @@ src_install() {
 	make DESTDIR="${D}" install
 
 	if use usb ; then
-	    insinto /etc/hotplug/usb
-	    doins gpsd.usermap
-	    exeinto /etc/hotplug/usb
-	    doexe gpsd.hotplug
-	    insinto /etc/udev/rules.d
-	    doins "${FILESDIR}"/99-gpsd-usb.rules
-	    keepdir /var/run/usb # needed for REMOVER
+		insinto /etc/hotplug/usb
+		doins gpsd.usermap
+		exeinto /etc/hotplug/usb
+		doexe gpsd.hotplug
+		insinto /etc/udev/rules.d
+		doins "${FILESDIR}"/99-gpsd-usb.rules
+		keepdir /var/run/usb # needed for REMOVER
 	else
-	    newconfd "${FILESDIR}"/gpsd.conf gpsd
-	    newinitd "${FILESDIR}"/gpsd.init gpsd
+		newconfd "${FILESDIR}"/gpsd.conf gpsd
+		newinitd "${FILESDIR}"/gpsd.init gpsd
 	fi
 
 	if use X && ! use minimal ; then
-	    insinto /etc/X11/app-defaults
-	    newins xgps.ad Xgps
-	    newins xgpsspeed.ad Xgpsspeed
+		insinto /etc/X11/app-defaults
+		newins xgps.ad Xgps
+		newins xgpsspeed.ad Xgpsspeed
 	else
-	    rm "${D}usr/share/man/man1/xgpsspeed.1.bz2" \
+		rm "${D}usr/share/man/man1/xgpsspeed.1.bz2" \
 		"${D}usr/share/man/man1/xgps.1.bz2"
 	fi
 
@@ -125,13 +125,13 @@ src_install() {
 	dobin logextract
 
 	if use python ; then
-	    exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
-	    doexe gps.py gpsfake.py gpspacket.so
+		exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
+		doexe gps.py gpsfake.py gpspacket.so
 	fi
 
 	if use minimal; then
-	    doman gpsctl.1 gpsflash.1 gpspipe.1 gpsd.8 gps.1
-	    use python && doman gpsprof.1 gpsfake.1 gpscat.1
+		doman gpsctl.1 gpsflash.1 gpspipe.1 gpsd.8 gps.1
+		use python && doman gpsprof.1 gpsfake.1 gpscat.1
 	fi
 
 	dodoc INSTALL README TODO
diff --git a/sci-geosciences/gpsd/gpsd-2.37.ebuild b/sci-geosciences/gpsd/gpsd-2.37.ebuild
index d6753eb8f594..da0ff55f5161 100644
--- a/sci-geosciences/gpsd/gpsd-2.37.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.37.ebuild,v 1.1 2008/06/02 20:01:03 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.37.ebuild,v 1.2 2008/06/27 10:31:15 ulm Exp $
 
 inherit eutils distutils
 
@@ -25,7 +25,7 @@ RDEPEND="X? (
 		x11-libs/libICE
 		x11-libs/libXpm
 		x11-libs/libXaw
-		virtual/motif
+		x11-libs/openmotif
 	)
 	python? ( dev-lang/python )
 
@@ -48,33 +48,33 @@ DEPEND="${RDEPEND}
 src_compile() {
 
 	local my_conf="--enable-shared --with-pic --enable-static \
-	    --disable-garmin --disable-garmintxt"
+		--disable-garmin --disable-garmintxt"
 	# Garmin support is broken in this version
 
 	use python && distutils_python_version
 
 	if use ntp; then
-	    my_conf="${my_conf} --enable-ntpshm --enable-pps"
+		my_conf="${my_conf} --enable-ntpshm --enable-pps"
 	else
-	    my_conf="${my_conf} --disable-ntpshm --disable-pps"
+		my_conf="${my_conf} --disable-ntpshm --disable-pps"
 	fi
 
 	if use minimal; then
-	    local max_clients="5"
-	    local max_devices="2"
-	    if ! use ntp; then
+		local max_clients="5"
+		local max_devices="2"
+		if ! use ntp; then
 		my_conf="${my_conf} --disable-pps"
-	    fi
-	    my_conf="${my_conf} --enable-squelch --without-x \
+		fi
+		my_conf="${my_conf} --enable-squelch --without-x \
 		--enable-max-devices=${max_devices} \
 		--enable-max-clients=${max_clients}"
 
-	    WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
+		WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
 		$(use_enable dbus) $(use_enable italk) \
 		$(use_enable itrax) $(use_enable python) \
 		|| die "econf failed"
 	else
-	    econf ${my_conf} $(use_enable dbus) $(use_enable italk) \
+		econf ${my_conf} $(use_enable dbus) $(use_enable italk) \
 		$(use_enable itrax) $(use_enable python) $(use_with X x) \
 		|| die "econf failed"
 	fi
@@ -89,24 +89,24 @@ src_install() {
 	make DESTDIR="${D}" install
 
 	if use usb ; then
-	    insinto /etc/hotplug/usb
-	    doins gpsd.usermap
-	    exeinto /etc/hotplug/usb
-	    doexe gpsd.hotplug
-	    insinto /etc/udev/rules.d
-	    doins "${FILESDIR}"/99-gpsd-usb.rules
-	    keepdir /var/run/usb # needed for REMOVER
+		insinto /etc/hotplug/usb
+		doins gpsd.usermap
+		exeinto /etc/hotplug/usb
+		doexe gpsd.hotplug
+		insinto /etc/udev/rules.d
+		doins "${FILESDIR}"/99-gpsd-usb.rules
+		keepdir /var/run/usb # needed for REMOVER
 	else
-	    newconfd "${FILESDIR}"/gpsd.conf gpsd
-	    newinitd "${FILESDIR}"/gpsd.init gpsd
+		newconfd "${FILESDIR}"/gpsd.conf gpsd
+		newinitd "${FILESDIR}"/gpsd.init gpsd
 	fi
 
 	if use X && ! use minimal ; then
-	    insinto /etc/X11/app-defaults
-	    newins xgps.ad Xgps
-	    newins xgpsspeed.ad Xgpsspeed
+		insinto /etc/X11/app-defaults
+		newins xgps.ad Xgps
+		newins xgpsspeed.ad Xgpsspeed
 	else
-	    rm "${D}usr/share/man/man1/xgpsspeed.1.bz2" \
+		rm "${D}usr/share/man/man1/xgpsspeed.1.bz2" \
 		"${D}usr/share/man/man1/xgps.1.bz2"
 	fi
 
@@ -114,13 +114,13 @@ src_install() {
 	dobin logextract
 
 	if use python ; then
-	    exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
-	    doexe gps.py gpsfake.py gpspacket.so
+		exeinto /usr/$(get_libdir)/python${PYVER}/site-packages
+		doexe gps.py gpsfake.py gpspacket.so
 	fi
 
 	if use minimal; then
-	    doman gpsctl.1 gpsflash.1 gpspipe.1 gpsd.8 gps.1
-	    use python && doman gpsprof.1 gpsfake.1 gpscat.1
+		doman gpsctl.1 gpsflash.1 gpspipe.1 gpsd.8 gps.1
+		use python && doman gpsprof.1 gpsfake.1 gpscat.1
 	fi
 
 	dodoc INSTALL README TODO