Remove static useflag, always build both shared and static library, thanks to Jakub Moc in bug #165385. Remove the broken idea of ABI compatibility symlinks.

Package-Manager: portage-2.1.2-r7

3 files changed, 23 insertions, 35 deletions

diff --git a/media-libs/libdvdcss/ChangeLog b/media-libs/libdvdcss/ChangeLog
index 96a70b19d240..04b9f0cf1329 100644
--- a/media-libs/libdvdcss/ChangeLog
+++ b/media-libs/libdvdcss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libdvdcss
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.60 2006/11/09 09:25:36 zzam Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.61 2007/02/05 11:20:44 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> libdvdcss-1.2.9.ebuild:
+  Remove static useflag, always build both shared and static library, thanks
+  to Jakub Moc in bug #165385. Remove the broken idea of ABI compatibility
+  symlinks.
 
   09 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> libdvdcss-1.2.9.ebuild:
   Changed automake-dependency to latest.
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index 33416ec27ebf..038a324803cb 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -6,14 +6,14 @@ MD5 41d9bae6e86e991ff9e8c59b5787f6b2 files/libdvdcss-1.2.9-doc.patch 642
 RMD160 6b2c8896ce9269efa17b35349c3af7fdde111ee1 files/libdvdcss-1.2.9-doc.patch 642
 SHA256 1c5bc4a450b397b6e8585d01df8e27385ec4cc1890bf9a3c1601cec42f000681 files/libdvdcss-1.2.9-doc.patch 642
 DIST libdvdcss-1.2.9.tar.bz2 283329 RMD160 5939a195f977544c25ea07e4d1f4b3ac4065212a SHA1 6c834633f58521d8ad09775f625cc723e30f2549 SHA256 b31e6afb88c9c37f9c299381bfed4663579cc8ce3d24a275b96d6b13f708b5e4
-EBUILD libdvdcss-1.2.9.ebuild 1843 RMD160 fc522455588f2b45ead40f3d048ea6b722714b70 SHA1 f622ad341f99383a6f9cd745643c1c6eeeae33bc SHA256 78a5f0db9ef012f3f52641dfb8c7009113a8b203b74f0581d6c7f021f18364d8
-MD5 27d5034bb8e9743c46f874254c47dcd5 libdvdcss-1.2.9.ebuild 1843
-RMD160 fc522455588f2b45ead40f3d048ea6b722714b70 libdvdcss-1.2.9.ebuild 1843
-SHA256 78a5f0db9ef012f3f52641dfb8c7009113a8b203b74f0581d6c7f021f18364d8 libdvdcss-1.2.9.ebuild 1843
-MISC ChangeLog 7324 RMD160 224615404035166f797f75006ecaa33aa8b3ab01 SHA1 5a1f3fff6c2e435bcc779b8730214019aae6aead SHA256 d339f936961c27dfeb9bca2164f5933c67658fb9182dbf370e4f3cd87411176a
-MD5 9f585ed083e4b7e811064986b965ed45 ChangeLog 7324
-RMD160 224615404035166f797f75006ecaa33aa8b3ab01 ChangeLog 7324
-SHA256 d339f936961c27dfeb9bca2164f5933c67658fb9182dbf370e4f3cd87411176a ChangeLog 7324
+EBUILD libdvdcss-1.2.9.ebuild 1492 RMD160 6dea8fb45f31d28b45a1787fdbcec766f8fae1b7 SHA1 851851da5d59082f820701b5023dad7491272cb3 SHA256 818aef9d93d1112638fbdae5028001797d5f106be788337f2e62aff748c28c3a
+MD5 a4434a4237f3dc7c530dee9b426270bd libdvdcss-1.2.9.ebuild 1492
+RMD160 6dea8fb45f31d28b45a1787fdbcec766f8fae1b7 libdvdcss-1.2.9.ebuild 1492
+SHA256 818aef9d93d1112638fbdae5028001797d5f106be788337f2e62aff748c28c3a libdvdcss-1.2.9.ebuild 1492
+MISC ChangeLog 7571 RMD160 29174f59359d3f5a68bd1e0a1837402325f47b5d SHA1 acc164ed02fe508ee3d195ef046664ac573dd7f1 SHA256 e7866ca1e2c4ffe82388bae680dec1ebe22a4373d9a079ab607b5f39aedae9a5
+MD5 6e8f6a9f339456ecb0412f9307beb3a9 ChangeLog 7571
+RMD160 29174f59359d3f5a68bd1e0a1837402325f47b5d ChangeLog 7571
+SHA256 e7866ca1e2c4ffe82388bae680dec1ebe22a4373d9a079ab607b5f39aedae9a5 ChangeLog 7571
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -22,9 +22,9 @@ MD5 6749ad80763398b23a70bbc169add9fb files/digest-libdvdcss-1.2.9 250
 RMD160 850ad2b612852ace0a9fafbb291296773182c266 files/digest-libdvdcss-1.2.9 250
 SHA256 6b296a299d35d128287d21b301d5d5016d3a56897dfa689f22d8afc84c9e0c95 files/digest-libdvdcss-1.2.9 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFUvQWt2vP6XvVdOcRAil+AJ4oTIvqbp/d298wuPodcPwUth0r2ACeJwMi
-FbsSVwRrx7TMwGceocmPtHg=
-=tE4F
+iD8DBQFFxxMTAiZjviIA2XgRAp8tAJ42pGJTNxxb61TShWcL3ZWDiTuueQCeI+eN
+ub6QKsjDN5ZunwAp35E3q1Q=
+=THWh
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.9.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.9.ebuild
index 3da41f2e3344..0d4cadf3b40d 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.9.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.2.9.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.9.ebuild,v 1.18 2006/11/09 09:25:36 zzam Exp $
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="latest"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.9.ebuild,v 1.19 2007/02/05 11:20:44 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -14,7 +11,7 @@ SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="1.2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc static"
+IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
@@ -49,7 +46,7 @@ src_compile() {
 	use doc && addwrite /var/cache/fonts
 
 	econf \
-		$(use_enable static) \
+		--enable-static --enable-shared \
 		$(use_enable doc) \
 		--disable-dependency-tracking || die
 	emake || die
@@ -60,18 +57,4 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog NEWS README
 	use doc && dohtml doc/html/*
-
-	##
-	## 0.0.3.* and 1.0.0 compat
-	##
-
-	# NOTE: this should be the last code in src_install() !!!
-
-	if [ -L ${D}/usr/$(get_libdir)/libdvdcss.so ]; then
-		realname=$(readlink ${D}/usr/$(get_libdir)/libdvdcss.so)
-
-		for x in libdvdcss.so.0 libdvdcss.so.1; do
-			dosym ${realname} /usr/$(get_libdir)/${x}
-		done
-	fi
 }