Make modular X friendly.

(Portage version: 2.0.54)

3 files changed, 23 insertions, 23 deletions

diff --git a/app-arch/pdv/ChangeLog b/app-arch/pdv/ChangeLog
index 5768e3207d8b..e9d81f422d91 100644
--- a/app-arch/pdv/ChangeLog
+++ b/app-arch/pdv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/pdv
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/ChangeLog,v 1.8 2005/05/17 20:09:16 wormo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/ChangeLog,v 1.9 2006/01/21 01:51:38 vanquirius Exp $
+
+  21 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> pdv-1.5.1-r1.ebuild:
+  Make modular X friendly.
 
 *pdv-1.5.1-r1 (17 May 2005)
 
diff --git a/app-arch/pdv/Manifest b/app-arch/pdv/Manifest
index 5f4c24874215..53be161645ae 100644
--- a/app-arch/pdv/Manifest
+++ b/app-arch/pdv/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6f0d738824574bb974c2e2f498002b2e ChangeLog 1015
 MD5 090b9bbcdafe60f821e963d2884f13ee files/digest-pdv-1.5.1 60
 MD5 090b9bbcdafe60f821e963d2884f13ee files/digest-pdv-1.5.1-r1 60
 MD5 eafc2d8347b9e03e7a27bbbbbeee750f files/pdv-1.5.1-early-free.patch 512
 MD5 34c1a74136e9d702d3645eff4ad1cf1d files/pdv-1.5.1-opt.patch 696
 MD5 7b95bbb283b41f502719e1655fa5f41b files/pdv-1.5.1-x-config.patch 529
-MD5 ef3a48d303c8832ad087db8383d99e30 pdv-1.5.1-r1.ebuild 1327
+MD5 b09d583df9a26526bf61c66d6f0c2dcf pdv-1.5.1-r1.ebuild 1458
 MD5 f7f51579b36c961562c86d1b34eedf03 pdv-1.5.1.ebuild 806
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDi8S3gIKl8Uu19MoRAnIPAJ9OZ5hZP/y5RXBF7OkQDIiT10EBeQCeOFGC
-6RZGpQHOrIvNC735exzI6yw=
-=zNcJ
------END PGP SIGNATURE-----
diff --git a/app-arch/pdv/pdv-1.5.1-r1.ebuild b/app-arch/pdv/pdv-1.5.1-r1.ebuild
index 3b73147fb9d3..69d08ba3a272 100644
--- a/app-arch/pdv/pdv-1.5.1-r1.ebuild
+++ b/app-arch/pdv/pdv-1.5.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/pdv-1.5.1-r1.ebuild,v 1.6 2005/11/29 02:59:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/pdv/pdv-1.5.1-r1.ebuild,v 1.7 2006/01/21 01:51:38 vanquirius Exp $
 
 inherit eutils
 
@@ -15,29 +15,36 @@ IUSE="nomotif"
 
 DEPEND=">=sys-devel/autoconf-2.58
 	sys-devel/automake
-	!nomotif? ( virtual/x11 x11-libs/openmotif )"
+	!nomotif? ( x11-libs/openmotif )
+	!nomotif? ( || (
+	( >=x11-libs/libX11-1.0.0
+	>=x11-libs/libXt-1.0.0
+	>=x11-libs/libXext-1.0.0
+	>=x11-libs/libXp-1.0.0 )
+	virtual/x11
+	) )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# fix a size-of-variable bug
-	epatch ${FILESDIR}/${P}-opt.patch
+	epatch "${FILESDIR}"/${P}-opt.patch
 	# fix a free-before-use bug
-	epatch ${FILESDIR}/${P}-early-free.patch
+	epatch "${FILESDIR}"/${P}-early-free.patch
 	# fix a configure script bug
-	epatch ${FILESDIR}/${P}-x-config.patch
+	epatch "${FILESDIR}"/${P}-x-config.patch
 }
 
 src_compile() {
 	# re-build configure script since patch was applied to configure.in
-	cd ${S}/X11
+	cd "${S}"/X11
 	export WANT_AUTOCONF=2.5
 	aclocal
 	automake -a -c
 	autoconf
 
-	cd ${S}
+	cd "${S}"
 	local myconf=""
 	use nomotif && myconf="--without-x" # configure script is broken, cant use use_with
 	econf ${myconf} || die
@@ -51,5 +58,5 @@ src_install() {
 		dobin X11/xmpdvmkpkg || die
 		doman xmpdvmkpkg.1 || die
 	fi
-	dodoc AUTHORS ChangeLog INSTALL NEWS README pdv.lsm
+	dodoc AUTHORS ChangeLog NEWS README pdv.lsm
 }