Make modular X friendly.

(Portage version: 2.0.54)

5 files changed, 15 insertions, 80 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index d83e555b89c1..ba45c566e487 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/opensc
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.18 2005/11/12 15:06:19 vanquirius Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.19 2006/01/19 02:49:25 vanquirius Exp $
+
+  19 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -opensc-0.9.6.ebuild,
+  opensc-0.10.0.ebuild:
+  Make modular X friendly.
 
 *opensc-0.10.0 (12 Nov 2005)
 
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 82ceefdb8862..fac0caa09ead 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8dab546f9e3cc113672e094ea978a686 ChangeLog 2954
 MD5 074aae91efbecf981a1e8ed73d5d1681 files/0.8.1-64bit.patch 577
 MD5 c0defe7b1d4debe167abbf8e9d29ea23 files/digest-opensc-0.10.0 66
 MD5 4fcfcb66c332083c66d4758cd414fc48 files/digest-opensc-0.9.4 65
-MD5 445cf2952a7b5ec61952c79beca84f7d files/digest-opensc-0.9.6 65
 MD5 c16f3cf2a3cb31195b173e54f4d2212d files/opensc-0.9.4-gcc4.patch 446
 MD5 286a92520aa59a11916aacd680088270 metadata.xml 663
-MD5 7ea30c97ac334c063d69e1bc12e982d4 opensc-0.10.0.ebuild 1452
+MD5 e488831b8564244dc704c02dce98f96a opensc-0.10.0.ebuild 1534
 MD5 ec3f36ae5756bf9ec8704d4c3f0cbf53 opensc-0.9.4.ebuild 1537
-MD5 c5d0739c98f472f7f9b182400fd38f22 opensc-0.9.6.ebuild 1515
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDvJZv2+ySkm8kpY0RAhMXAJ4g+uMyX4L9wP6gATWHmbKGf8mqmACgpm9t
-OtvBTT3xYRYfeZMDd1LVXZA=
-=UXlk
------END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/files/digest-opensc-0.9.6 b/dev-libs/opensc/files/digest-opensc-0.9.6
deleted file mode 100644
index bd1b9b2d2967..000000000000
--- a/dev-libs/opensc/files/digest-opensc-0.9.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38fdd64566cc6fc83338d659e816b4fb opensc-0.9.6.tar.gz 1002151
diff --git a/dev-libs/opensc/opensc-0.10.0.ebuild b/dev-libs/opensc/opensc-0.10.0.ebuild
index 8a2b46e186e5..d9447f3ea708 100644
--- a/dev-libs/opensc/opensc-0.10.0.ebuild
+++ b/dev-libs/opensc/opensc-0.10.0.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/dev-libs/opensc/opensc-0.10.0.ebuild,v 1.3 2006/01/05 03:44:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.10.0.ebuild,v 1.4 2006/01/19 02:49:25 vanquirius Exp $
 
 inherit eutils libtool
 
@@ -13,10 +13,15 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ldap pam pcsc-lite X"
 
-RDEPEND="ldap? ( net-nds/openldap )
+DEPEND="X? ( || (
+	( >=x11-libs/libX11-1.0.0
+	>=x11-libs/libXt-1.0.0 )
+	virtual/x11 ) )"
+
+RDEPEND="${DEPEND}
+	ldap? ( net-nds/openldap )
 	pam? ( >=sys-libs/pam-0.77
 		>=sys-apps/shadow-4.0.3 )
-	X? ( virtual/x11 )
 	pcsc-lite? ( sys-apps/pcsc-lite )
 	!pcsc-lite? ( >=dev-libs/openct-0.5.0 )"
 
diff --git a/dev-libs/opensc/opensc-0.9.6.ebuild b/dev-libs/opensc/opensc-0.9.6.ebuild
deleted file mode 100644
index 3d513daf68ab..000000000000
--- a/dev-libs/opensc/opensc-0.9.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.9.6.ebuild,v 1.2 2005/09/17 00:59:18 ciaranm Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="SmartCard library and applications"
-HOMEPAGE="http://www.opensc.org/"
-SRC_URI="http://www.opensc.org/files/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~arm ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="ldap pam pcsc-lite X"
-
-RDEPEND="ldap? ( net-nds/openldap )
-	pam? ( >=sys-libs/pam-0.77
-		>=sys-apps/shadow-4.0.3 )
-	X? ( virtual/x11 )
-	pcsc-lite? ( sys-apps/pcsc-lite )
-	!pcsc-lite? ( >=dev-libs/openct-0.5.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use X || echo 'all:'$'\n''install:' > src/signer/Makefile.in
-	EPATCH_SINGLE_MSG="Applying libtool reverse deps patch ..." \
-		epatch ${ELT_PATCH_DIR}/fix-relink/1.5.0
-	epatch ${FILESDIR}/opensc-0.9.4-gcc4.patch
-}
-
-src_compile() {
-	local mycard=""
-	use pcsc-lite \
-		&& mycard="--with-pcsclite" \
-		|| mycard="--with-openct=/usr"
-	econf \
-		--disable-usbtoken \
-		--with-plugin-dir=/usr/lib/mozilla/plugins \
-		`use_enable ldap` \
-		`use_with pam` \
-		${mycard} \
-		|| die
-
-	# --without-plugin-dir generates a /no directory
-
-
-	emake -j1 || die
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-
-	if use pam ; then
-		dodir /lib/security/
-		dosym ../../usr/lib/security/pam_opensc.so /lib/security/
-	fi
-
-	dodoc ANNOUNCE AUTHORS ChangeLog NEWS README
-	dohtml docs/opensc.{html,css}
-}