Clean up ebuild and add sh love.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 30 insertions, 28 deletions

diff --git a/media-libs/libdvdcss/ChangeLog b/media-libs/libdvdcss/ChangeLog
index c5af8e5f536f..79012be29886 100644
--- a/media-libs/libdvdcss/ChangeLog
+++ b/media-libs/libdvdcss/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libdvdcss
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.51 2005/12/14 19:38:30 killerfox Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.52 2006/01/13 12:11:40 vapier Exp $
+
+  13 Jan 2006; Mike Frysinger <vapier@gentoo.org> libdvdcss-1.2.9.ebuild:
+  Clean up ebuild and add sh love.
 
   14 Dec 2005; Rene Nussbaumer <killerfox@gentoo.org>
   libdvdcss-1.2.9.ebuild:
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index 690689e1ac8b..24f205a788e7 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,7 +1,17 @@
-MD5 5dfab00631dbe105580bb5aab37fd12c ChangeLog 6337
-MD5 04f7ffb6f496ba9edb5cd1da36578c92 libdvdcss-1.2.8.ebuild 1793
-MD5 3c7f2005f50042d1bd7218df14d98f66 libdvdcss-1.2.9.ebuild 1782
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c34a0e60b665fb62c50e49d3388468dd ChangeLog 6444
 MD5 da63484d0425ce9588e97520456a0cf1 files/digest-libdvdcss-1.2.8 68
 MD5 84eef00ec2c7e0b2d30c94c4fb19e453 files/digest-libdvdcss-1.2.9 68
 MD5 41d9bae6e86e991ff9e8c59b5787f6b2 files/libdvdcss-1.2.9-doc.patch 642
+MD5 04f7ffb6f496ba9edb5cd1da36578c92 libdvdcss-1.2.8.ebuild 1793
+MD5 3be5d023e08314d66afc0c0c6827f8f6 libdvdcss-1.2.9.ebuild 1791
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDx5lh2+ySkm8kpY0RAruyAJ9yVDKB/35cNuI2vhnlKOuq0g8VzQCeNahS
+CxF8e/cc9qi6ULlY8RzG3wY=
+=nLlJ
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.9.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.9.ebuild
index 22d44dc44021..b481089f2578 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.9.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.2.9.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/media-libs/libdvdcss/libdvdcss-1.2.9.ebuild,v 1.11 2005/12/14 19:38:30 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.9.ebuild,v 1.12 2006/01/13 12:11:40 vapier Exp $
 
 inherit eutils autotools
 
@@ -10,7 +10,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 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 sh sparc x86"
 IUSE="doc static"
 
 DEPEND="doc? ( app-doc/doxygen )"
@@ -19,20 +19,19 @@ RDEPEND=""
 pkg_preinst() {
 	# these could cause problems if they exist from
 	# earlier builds
-	for x in libdvdcss.so.0 libdvdcss.so.1 libdvdcss.0.dylib libdvdcss.1.dylib
-	do
-		if [ -f /usr/$(get_libdir)/${x} ] || [ -L /usr/$(get_libdir)/${x} ]; then
-			rm -f /usr/$(get_libdir)/${x}
+	for x in libdvdcss.so.0 libdvdcss.so.1 libdvdcss.0.dylib libdvdcss.1.dylib ; do
+		if [[ -e ${ROOT}/usr/$(get_libdir)/${x} ]] ; then
+			rm -f "${ROOT}"/usr/$(get_libdir)/${x}
 		fi
 	done
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# add configure switches to enable/disable doc building
-	epatch ${FILESDIR}/${P}-doc.patch
+	epatch "${FILESDIR}"/${P}-doc.patch
 
 	eautoreconf
 }
@@ -54,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die
+	make install DESTDIR="${D}" || die
 
 	dodoc AUTHORS ChangeLog NEWS README
 	use doc && dohtml doc/html/*
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index f26e68202a1b..ae16be99bc28 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d0e4ffaf1cd7f889615d4775f48988f4 ChangeLog 22912
 MD5 943fd105ac79aeededd17357690d76bc files/CVE-2005-4048.patch 3426
 MD5 33da8deb9637be23cd464aba9c5c4ac4 files/digest-xine-lib-1.1.0 137
@@ -12,13 +9,6 @@ MD5 cd292167e0ca6e7910e1cf32091e3a27 files/xine-lib-formatstring.patch 315
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 MD5 3e7009cff141eff5526219bfc185ece9 xine-lib-1.1.0.ebuild 7254
 MD5 d876573d0c98143ef9fe1272aa6df29d xine-lib-1.1.1-r2.ebuild 6761
-MD5 64d51accad21e5f76d7700c9c32b1649 xine-lib-1.1.1-r3.ebuild 7227
-MD5 1e6f96268dd284555139bf93dda671c1 xine-lib-1.1.1-r4.ebuild 7263
+MD5 f83e3437a588787cfdb9b54a8ee7f50c xine-lib-1.1.1-r3.ebuild 7229
+MD5 52ec20e09dbaaf493eebf03bed1b4904 xine-lib-1.1.1-r4.ebuild 7269
 MD5 9763f892b768b1c556fb311680ede798 xine-lib-1_rc8-r2.ebuild 5278
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxuXV2+ySkm8kpY0RAgReAKC+EgTHluUezXcY8iK/YhyribwTlACglr7H
-EgR/G8FBR2ZfK2rD0/etNHI=
-=FQ7E
------END PGP SIGNATURE-----