fixed sandbox violations when CONF_LIBDIR is set by adding DESTDIR support to the makefile. marked stable on amd64 for this fix

3 files changed, 63 insertions, 7 deletions

diff --git a/media-sound/cdparanoia/ChangeLog b/media-sound/cdparanoia/ChangeLog
index 070d49ee7ee2..cf59abbb2133 100644
--- a/media-sound/cdparanoia/ChangeLog
+++ b/media-sound/cdparanoia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/cdparanoia
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.16 2004/09/01 08:03:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/ChangeLog,v 1.17 2004/09/22 01:50:10 lv Exp $
+
+  21 Sep 2004; Travis Tilley <lv@gentoo.org>
+  +files/cdparanoia-3.9.8-use-destdir.patch, cdparanoia-3.9.8-r2.ebuild:
+  fixed sandbox violations when CONF_LIBDIR is set by adding DESTDIR support to
+  the makefile. marked stable on amd64 for this fix
 
 *cdparanoia-3.9.8-r2 (01 Sep 2004)
 
diff --git a/media-sound/cdparanoia/cdparanoia-3.9.8-r2.ebuild b/media-sound/cdparanoia/cdparanoia-3.9.8-r2.ebuild
index 6bc0ec52cd3d..76b176cc78c4 100644
--- a/media-sound/cdparanoia/cdparanoia-3.9.8-r2.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.9.8-r2.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-sound/cdparanoia/cdparanoia-3.9.8-r2.ebuild,v 1.1 2004/09/01 08:03:09 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdparanoia/cdparanoia-3.9.8-r2.ebuild,v 1.2 2004/09/22 01:50:10 lv Exp $
 
 inherit eutils flag-o-matic gnuconfig
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.xiph.org/paranoia/download/${MY_P}.src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa amd64 ~ia64 ~mips ~ppc64"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -27,6 +27,11 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-toc.patch
 	epatch ${FILESDIR}/${P}-identify_crash.patch
 	epatch ${FILESDIR}/${PV}-gcc34.patch
+
+	# if libdir is specified, cdparanoia causes sandbox violations, and using
+	# einstall doesnt work around it. so lets patch in DESTDIR support
+	epatch ${FILESDIR}/${P}-use-destdir.patch
+
 	ln -s configure.guess config.guess
 	ln -s configure.sub config.sub
 	gnuconfig_update
@@ -41,9 +46,6 @@ src_compile() {
 
 src_install() {
 	dodir /usr/{bin,lib,include} /usr/share/man/man1
-	make \
-		prefix=${D}/usr \
-		MANDIR=${D}/usr/share/man \
-		install || die
+	make DESTDIR=${D} install || die
 	dodoc FAQ.txt README
 }
diff --git a/media-sound/cdparanoia/files/cdparanoia-3.9.8-use-destdir.patch b/media-sound/cdparanoia/files/cdparanoia-3.9.8-use-destdir.patch
new file mode 100644
index 000000000000..a159f65603d3
--- /dev/null
+++ b/media-sound/cdparanoia/files/cdparanoia-3.9.8-use-destdir.patch
@@ -0,0 +1,49 @@
+--- Makefile.in.orig	2004-09-21 21:34:31.921768944 +0000
++++ Makefile.in	2004-09-21 21:38:22.395731576 +0000
+@@ -64,28 +64,28 @@
+ 	cd paranoia && $(MAKE) slib
+ 
+ install:
+-	$(INSTALL) -d -m 0755 $(BINDIR)
+-	$(INSTALL) -m 0755 $(srcdir)/cdparanoia $(BINDIR)
+-	$(INSTALL) -d -m 0755 $(MANDIR)
+-	$(INSTALL) -d -m 0755 $(MANDIR)/man1
+-	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(MANDIR)/man1
+-	$(INSTALL) -d -m 0755 $(INCLUDEDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(INCLUDEDIR)
+-	$(INSTALL) -d -m 0755 $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(INCLUDEDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(LIBDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/utils.h $(INCLUDEDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR)
++	$(INSTALL) -m 0755 $(srcdir)/cdparanoia $(DESTDIR)$(BINDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man1
++	$(INSTALL) -m 0644 $(srcdir)/cdparanoia.1 $(DESTDIR)$(MANDIR)/man1
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL) -m 0644 $(srcdir)/paranoia/cdda_paranoia.h $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/paranoia/libcdda_paranoia.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/interface/cdda_interface.h $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.so.0.$(VERSION) $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/interface/libcdda_interface.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 $(srcdir)/utils.h $(DESTDIR)$(INCLUDEDIR)
+ 	ln -fs libcdda_interface.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_interface.so.0
++		$(DESTDIR)$(LIBDIR)/libcdda_interface.so.0
+ 	ln -fs libcdda_interface.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_interface.so
++		$(DESTDIR)$(LIBDIR)/libcdda_interface.so
+ 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_paranoia.so.0
++		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so.0
+ 	ln -fs libcdda_paranoia.so.0.$(VERSION) \
+-		$(LIBDIR)/libcdda_paranoia.so
++		$(DESTDIR)$(LIBDIR)/libcdda_paranoia.so
+ 
+ cdparanoia:	$(OFILES) $(LIBDEP)
+ 		$(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \