summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-10-07 02:55:54 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-10-07 02:55:54 +0000
commitf05ac09bf5b9c652a907cc6d9a4b32ad8a2839c7 (patch)
tree418d4a1824254bdad58dec4a86d3123e3688b764 /media-libs/libdvdcss
parentget_libdir fixes. (Manifest recommit) (diff)
downloadgentoo-2-f05ac09bf5b9c652a907cc6d9a4b32ad8a2839c7.tar.gz
gentoo-2-f05ac09bf5b9c652a907cc6d9a4b32ad8a2839c7.tar.bz2
gentoo-2-f05ac09bf5b9c652a907cc6d9a4b32ad8a2839c7.zip
get_libdir fixes.
Diffstat (limited to 'media-libs/libdvdcss')
-rw-r--r--media-libs/libdvdcss/ChangeLog6
-rw-r--r--media-libs/libdvdcss/libdvdcss-1.2.8.ebuild14
2 files changed, 12 insertions, 8 deletions
diff --git a/media-libs/libdvdcss/ChangeLog b/media-libs/libdvdcss/ChangeLog
index 3f5df83ecc59..3a5ed6394125 100644
--- a/media-libs/libdvdcss/ChangeLog
+++ b/media-libs/libdvdcss/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libdvdcss
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.35 2004/09/24 21:14:08 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.36 2004/10/07 02:55:54 eradicator Exp $
+
+ 06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ libdvdcss-1.2.8.ebuild:
+ get_libdir fixes.
24 Sep 2004; kito@gentoo.org libdvdcss-1.2.8.ebuild:
~ppc-macos keyword
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild
index 846c30f3a545..f43449b77385 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild,v 1.17 2004/09/24 21:14:08 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild,v 1.18 2004/10/07 02:55:54 eradicator Exp $
DESCRIPTION="A portable abstraction library for DVD decryption"
HOMEPAGE="http://developers.videolan.org/libdvdcss/"
@@ -18,9 +18,9 @@ pkg_preinst() {
# earlier builds
for x in libdvdcss.so.0 libdvdcss.so.1
do
- if [ -f /usr/lib/${x} ] || [ -L /usr/lib/${x} ]
+ if [ -f /usr/$(get_libdir)/${x} ] || [ -L /usr/$(get_libdir)/${x} ]
then
- rm -f /usr/lib/${x}
+ rm -f /usr/$(get_libdir)/${x}
fi
done
}
@@ -47,19 +47,19 @@ src_install() {
# NOTE: this should be the last code in src_install() !!!
- if [ -L ${D}/usr/lib/libdvdcss.so ]
+ if [ -L ${D}/usr/$(get_libdir)/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}')"
+ local realname="$(ls -l ${D}/usr/$(get_libdir)/libdvdcss.so |gawk '{print $11}')"
[ -z "${realname}" ] && \
- realname="$(ls -l ${D}/usr/lib/libdvdcss.so |gawk '{print $10}')"
+ realname="$(ls -l ${D}/usr/$(get_libdir)/libdvdcss.so |gawk '{print $10}')"
[ -z "${realname}" ] && return 0
for x in libdvdcss.so.0 libdvdcss.so.1
do
- dosym ${realname} /usr/lib/${x}
+ dosym ${realname} /usr/$(get_libdir)/${x}
done
fi
}