Fixed rpm sandbox issue, closes bug#157773

(Portage version: 2.1.2-r4)

3 files changed, 30 insertions, 4 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index b6cc66e11b81..b7d0895ccd33 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.88 2007/01/28 18:20:59 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.89 2007/01/29 21:32:55 alonbl Exp $
+
+  29 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/libgphoto2-2.3.1-rpm.patch, libgphoto2-2.3.1-r1.ebuild:
+  Fixed rpm sandbox issue, closes bug#157773
 
 *libgphoto2-2.3.1-r1 (28 Jan 2007)
 
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.3.1-rpm.patch b/media-libs/libgphoto2/files/libgphoto2-2.3.1-rpm.patch
new file mode 100644
index 000000000000..d442019dfca7
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.3.1-rpm.patch
@@ -0,0 +1,15 @@
+
+It tries to creat /var/lib/rpm...
+
+diff -urNp libgphoto2-2.3.1.org/configure libgphoto2-2.3.1/configure
+--- libgphoto2-2.3.1.org/configure	2006-12-24 21:12:44.000000000 +0200
++++ libgphoto2-2.3.1/configure	2007-01-29 23:28:31.000000000 +0200
+@@ -30296,7 +30296,7 @@ fi
+ # RPM packages or not.
+ 
+ 
+-if rpm -q libusb-devel > /dev/null 2>&1; then
++if false -q libusb-devel > /dev/null 2>&1; then
+   RPM_LIBUSB_DEVEL_TRUE=
+   RPM_LIBUSB_DEVEL_FALSE='#'
+ else
diff --git a/media-libs/libgphoto2/libgphoto2-2.3.1-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.3.1-r1.ebuild
index e1c8eadaeafa..76fcece6a54c 100644
--- a/media-libs/libgphoto2/libgphoto2-2.3.1-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.3.1-r1.ebuild,v 1.1 2007/01/28 18:20:59 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.3.1-r1.ebuild,v 1.2 2007/01/29 21:32:55 alonbl Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -53,6 +53,12 @@ pkg_setup() {
 	enewgroup plugdev || die "Error creating plugdev group"
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-rpm.patch"
+}
+
 src_compile() {
 	local cameras
 	local cam
@@ -80,10 +86,11 @@ src_compile() {
 		--with-doc-dir=/usr/share/doc/${PF} \
 		--with-html-dir=/usr/share/doc/${PF}/html \
 		--with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \
-		udevscriptdir=/lib/udev \
+		$(use_enable doc docs) \
 		$(use_enable nls) \
+		--with-rpmbuild=/bin/true \
+		udevscriptdir=/lib/udev \
 		${myconf} || die "econf failed"
-#		$(use_enable doc docs) \		TODO
 
 	emake || die "make failed"
 }