7 files changed, 30 insertions, 80 deletions
diff --git a/media-libs/libdvdcss/ChangeLog b/media-libs/libdvdcss/ChangeLog
index bc4d8bb03c08..631f6a2c35b2 100644
--- a/media-libs/libdvdcss/ChangeLog
+++ b/media-libs/libdvdcss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libdvdcss
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.3 2002/05/22 19:47:08 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.4 2002/05/23 21:35:34 azarah Exp $
+
+*libdvdcss-1.1.1-r2 (23 May 2002)
+
+  23 May 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Ok, this should resolve bug #2908.
 
 *libdvdcss-1.1.1-r1 (22 May 2002)
 
diff --git a/media-libs/libdvdcss/files/digest-libdvdcss-1.0.0 b/media-libs/libdvdcss/files/digest-libdvdcss-1.0.0
deleted file mode 100644
index 80b93564d229..000000000000
--- a/media-libs/libdvdcss/files/digest-libdvdcss-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e2191aa0ff9aca0a3048e4237b1897d libdvdcss-1.0.0.tar.bz2 130444
diff --git a/media-libs/libdvdcss/files/digest-libdvdcss-1.1.1-r1 b/media-libs/libdvdcss/files/digest-libdvdcss-1.1.1-r1
deleted file mode 100644
index fc7149d5dd55..000000000000
--- a/media-libs/libdvdcss/files/digest-libdvdcss-1.1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 46aa194f044763dcdb22cfc191950b68 libdvdcss-1.1.1.tar.gz 199856
diff --git a/media-libs/libdvdcss/files/digest-libdvdcss-1.1.1 b/media-libs/libdvdcss/files/digest-libdvdcss-1.1.1-r2
index fc7149d5dd55..fc7149d5dd55 100644
--- a/media-libs/libdvdcss/files/digest-libdvdcss-1.1.1
+++ b/media-libs/libdvdcss/files/digest-libdvdcss-1.1.1-r2
diff --git a/media-libs/libdvdcss/libdvdcss-1.0.0.ebuild b/media-libs/libdvdcss/libdvdcss-1.0.0.ebuild
deleted file mode 100644
index eac67b1622e9..000000000000
--- a/media-libs/libdvdcss/libdvdcss-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.0.0.ebuild,v 1.2 2002/02/12 19:42:47 verwilst Exp $
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="A portable abstraction library for DVD decryption"
-SRC_URI="http://www.videolan.org/pub/videolan/libdvdcss/${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.videolan.org/libdvdcss/"
-
-DEPEND="virtual/glibc"
-
-
-src_compile() {
-
-	./configure --prefix=/usr					\
-		    --mandir=/usr/share/man				\
-		    --infodir=/usr/share/info ||die
-		    
-	make || die
-}
-
-src_install() {
-	
-	make prefix=${D}/usr						\
-	     mandir=${D}/usr/share/man					\
-	     infodir=${D}/usr/share/info				\
-	     install || die
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
-}
-
diff --git a/media-libs/libdvdcss/libdvdcss-1.1.1-r1.ebuild b/media-libs/libdvdcss/libdvdcss-1.1.1-r2.ebuild
index 7d1af66c8074..8b6057a5c442 100644
--- a/media-libs/libdvdcss/libdvdcss-1.1.1-r1.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.1.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.1.1-r1.ebuild,v 1.1 2002/05/22 19:47:08 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.1.1-r2.ebuild,v 1.1 2002/05/23 21:35:34 azarah Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A portable abstraction library for DVD decryption"
@@ -31,13 +31,29 @@ src_install() {
 	     infodir=${D}/usr/share/info \
 	     install || die
 
-	# 0.0.3.* and 1.0.0 compat
-	dosym $(ls -l ${D}/usr/lib/libdvdcss.so | /usr/bin/gawk '{print $11}') \
-		/usr/lib/libdvdcss.so.0
-	dosym $(ls -l ${D}/usr/lib/libdvdcss.so | /usr/bin/gawk '{print $11}') \
-		/usr/lib/libdvdcss.so.1
-
 	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
+	
+	##
+	## 0.0.3.* and 1.0.0 compat
+	##
+
+	# NOTE: this should be the last code in src_install() !!!
+
+	if [ -L ${D}/usr/lib/libdvdcss.so ]
+	then
+		# on some locales the name of the file a symlink points to, is in the
+		# tenth field, and not the eleventh (bug #2908)
+		LC_ALL='C'
+		local realname=$(ls -l ${D}/usr/lib/libdvdcss.so |gawk '{print $11}')
+		[ -z "${realname}" ] && \
+			realname=$(ls -l ${D}/usr/lib/libdvdcss.so |gawk '{print $10}')
+		[ -z "${realname}" ] && return 0
+	
+		for x in libdvdcss.so.0 libdvdcss.so.1
+		do
+			dosym ${realname} /usr/lib/${x}
+		done
+	fi
 }
 
 pkg_preinst() {
diff --git a/media-libs/libdvdcss/libdvdcss-1.1.1.ebuild b/media-libs/libdvdcss/libdvdcss-1.1.1.ebuild
deleted file mode 100644
index cc31b1cbed2b..000000000000
--- a/media-libs/libdvdcss/libdvdcss-1.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.1.1.ebuild,v 1.1 2002/04/06 15:47:48 azarah Exp $
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="A portable abstraction library for DVD decryption"
-SRC_URI="http://www.videolan.org/pub/videolan/libdvdcss/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.videolan.org/libdvdcss/"
-
-DEPEND="virtual/glibc"
-
-
-src_compile() {
-
-	./configure --prefix=/usr \
-		    --mandir=/usr/share/man \
-		    --infodir=/usr/share/info ||die
-		    
-	make || die
-}
-
-src_install() {
-	
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     infodir=${D}/usr/share/info \
-	     install || die
-
-	# 0.0.3.* and 1.0.0 compat
-	dosym $(ls -l ${D}/usr/lib/libdvdcss.so |awk '{print $11}') \
-		/usr/lib/libdvdcss.so.0
-	dosym $(ls -l ${D}/usr/lib/libdvdcss.so |awk '{print $11}') \
-		/usr/lib/libdvdcss.so.1
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
-}
-