9 files changed, 26 insertions, 80 deletions
diff --git a/media-libs/libdvdcss/ChangeLog b/media-libs/libdvdcss/ChangeLog
index 61fbd98feb7e..459bc8320230 100644
--- a/media-libs/libdvdcss/ChangeLog
+++ b/media-libs/libdvdcss/ChangeLog
@@ -1,6 +1,11 @@
 # 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.9 2002/10/16 08:15:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.10 2002/11/20 15:51:07 azarah Exp $
+
+*libdvdcss-1.2.4 (20 Nov 2002)
+
+  20 Nov 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Update to latest version, closing bug #10859.
 
 *libdvdcss-1.2.3 (16 Oct 2002)
 
diff --git a/media-libs/libdvdcss/files/digest-libdvdcss-1.2.1 b/media-libs/libdvdcss/files/digest-libdvdcss-1.2.1
deleted file mode 100644
index aa2a8bfea500..000000000000
--- a/media-libs/libdvdcss/files/digest-libdvdcss-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e5c01162806456a03f4bd474ac7e64a3 libdvdcss-1.2.1.tar.gz 204002
diff --git a/media-libs/libdvdcss/files/digest-libdvdcss-1.2.2 b/media-libs/libdvdcss/files/digest-libdvdcss-1.2.2
deleted file mode 100644
index c013f27c93dd..000000000000
--- a/media-libs/libdvdcss/files/digest-libdvdcss-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd1814be0ef950dcb6b89dd7028442ef libdvdcss-1.2.2.tar.gz 224052
diff --git a/media-libs/libdvdcss/files/digest-libdvdcss-1.2.4 b/media-libs/libdvdcss/files/digest-libdvdcss-1.2.4
new file mode 100644
index 000000000000..cd24518965fe
--- /dev/null
+++ b/media-libs/libdvdcss/files/digest-libdvdcss-1.2.4
@@ -0,0 +1 @@
+MD5 1b2a396b4384fa31e20574766e2b03df libdvdcss-1.2.4.tar.gz 251490
diff --git a/media-libs/libdvdcss/libdvdcss-0.0.3.3.ebuild b/media-libs/libdvdcss/libdvdcss-0.0.3.3.ebuild
index 71e80f891e87..f168ec759642 100644
--- a/media-libs/libdvdcss/libdvdcss-0.0.3.3.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-0.0.3.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-0.0.3.3.ebuild,v 1.7 2002/08/14 13:08:09 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-0.0.3.3.ebuild,v 1.8 2002/11/20 15:51:07 azarah Exp $
+
+IUSE=""
 
 MY_PV="`echo ${PV} |sed -e 's/\./\.ogle/3'`"
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/media-libs/libdvdcss/libdvdcss-1.1.1-r2.ebuild b/media-libs/libdvdcss/libdvdcss-1.1.1-r2.ebuild
index d7e010fd86eb..467fa51a830f 100644
--- a/media-libs/libdvdcss/libdvdcss-1.1.1-r2.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.1.1-r2.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.1.1-r2.ebuild,v 1.5 2002/10/04 05:48:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.1.1-r2.ebuild,v 1.6 2002/11/20 15:51:07 azarah Exp $
 
-S=${WORKDIR}/${P}
+IUSE=""
+
+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/"
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.1.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.1.ebuild
deleted file mode 100644
index 43890c192385..000000000000
--- a/media-libs/libdvdcss/libdvdcss-1.2.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.1.ebuild,v 1.5 2002/10/04 05:48:21 vapier 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/"
-
-SLOT="1.2"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc sparc64"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-	# Dont use custom optimiziations, as it gives problems
-	# on some archs
-	CFLAGS="" \
-	CXXFLAGS="" \
-	econf || die
-		    
-	make || die
-}
-
-src_install() {
-	
-	einstall || die
-
-	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() {
-
-	# these could cause problems if they exist from
-	# earlier builds
-	for x in libdvdcss.so.0 libdvdcss.so.1
-	do
-		if [ -f /usr/lib/${x} ] || [ -L /usr/lib/${x} ]
-		then
-			rm -f /usr/lib/${x}
-		fi
-	done
-}
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.3.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.3.ebuild
index 15784c998f86..6da693ae2929 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.3.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.2.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.3.ebuild,v 1.1 2002/10/16 08:15:48 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.3.ebuild,v 1.2 2002/11/20 15:51:07 azarah Exp $
+
+IUSE=""
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A portable abstraction library for DVD decryption"
@@ -41,9 +43,9 @@ src_install() {
 		# 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}')
+		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}')
+			realname="$(ls -l ${D}/usr/lib/libdvdcss.so |gawk '{print $10}')"
 		[ -z "${realname}" ] && return 0
 	
 		for x in libdvdcss.so.0 libdvdcss.so.1
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.2.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.4.ebuild
index 8fbcfb4a8850..69365ce138b2 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.2.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.2.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.2.ebuild,v 1.4 2002/10/04 05:48:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.4.ebuild,v 1.1 2002/11/20 15:51:07 azarah Exp $
+
+IUSE=""
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A portable abstraction library for DVD decryption"
@@ -9,7 +11,7 @@ HOMEPAGE="http://www.videolan.org/libdvdcss/"
 
 SLOT="1.2"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
 
 DEPEND="virtual/glibc"
 
@@ -41,9 +43,9 @@ src_install() {
 		# 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}')
+		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}')
+			realname="$(ls -l ${D}/usr/lib/libdvdcss.so |gawk '{print $10}')"
 		[ -z "${realname}" ] && return 0
 	
 		for x in libdvdcss.so.0 libdvdcss.so.1
@@ -65,3 +67,4 @@ pkg_preinst() {
 		fi
 	done
 }
+