From: Alon Bar-Lev <alonbl@gentoo.org>
Date: Mon, 29 Jan 2007 21:32:55 +0000 (+0000)
Subject: Fixed rpm sandbox issue, closes bug#157773
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa7fad726604ac1113a1bd9caf6e5e2f3d006952;p=gentoo.git

Fixed rpm sandbox issue, closes bug#157773
Package-Manager: portage-2.1.2-r4
---

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/Manifest b/media-libs/libgphoto2/Manifest
index 1233e407de62..5fb2be72b37f 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -26,6 +26,10 @@ AUX libgphoto2-2.2.1-ngettext.patch 542 RMD160 04870c8dc64be5bd25885bd00b3e7a019
 MD5 346c47d1d96769c6d5a6070f2854ecd8 files/libgphoto2-2.2.1-ngettext.patch 542
 RMD160 04870c8dc64be5bd25885bd00b3e7a019239c82d files/libgphoto2-2.2.1-ngettext.patch 542
 SHA256 4132274f809e3041de93c0e55d8b2f29d766b46a1eb11af37c7a404588d9208a files/libgphoto2-2.2.1-ngettext.patch 542
+AUX libgphoto2-2.3.1-rpm.patch 456 RMD160 77c45c7c811f24bd8916a2366fca0ad6c7cd1adf SHA1 cb50764d7ce9fd3538c37d7ae4e682a9946c7700 SHA256 e0fff2950b7b6276586352bdc487c989cd02432df20eb8f604dc4f5f3ee5d284
+MD5 b3498ad89c74301d88765d341edd9d9b files/libgphoto2-2.3.1-rpm.patch 456
+RMD160 77c45c7c811f24bd8916a2366fca0ad6c7cd1adf files/libgphoto2-2.3.1-rpm.patch 456
+SHA256 e0fff2950b7b6276586352bdc487c989cd02432df20eb8f604dc4f5f3ee5d284 files/libgphoto2-2.3.1-rpm.patch 456
 DIST libgphoto2-2.1.6.tar.gz 3205731 RMD160 ef32357d9722a69d20a02098bd30c13165c27e6a SHA1 22be325303fa10a4a3f519d71b25364b3f84d653 SHA256 f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80
 DIST libgphoto2-2.2.1.tar.gz 4474022 RMD160 0b93ba1b6fe80c909623691f7a2452f01fa8832d SHA1 6636ae0020c201abaea74f9e3ea2d4bd404587c0 SHA256 2b8bdf357283951f990a05c8ffe897f57ddfa6be2bd1eca4253c13631405c9cf
 DIST libgphoto2-2.3.1.tar.bz2 3230934 RMD160 ab678a5006a89ef1fe9f052dac1f9738961cc3a8 SHA1 13cc3f05ee298b33cd03ba4b772ef05a3aa49b97 SHA256 b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727
@@ -37,14 +41,14 @@ EBUILD libgphoto2-2.2.1-r1.ebuild 5543 RMD160 64b18721e07f878524c5b8e703bb619ba1
 MD5 696e963901bbee33a456eb31a563ba3b libgphoto2-2.2.1-r1.ebuild 5543
 RMD160 64b18721e07f878524c5b8e703bb619ba1922b62 libgphoto2-2.2.1-r1.ebuild 5543
 SHA256 4780b2f04698df770e0967469e3faabcf063b0d4abe2bbaae72bd481f8d5e8ec libgphoto2-2.2.1-r1.ebuild 5543
-EBUILD libgphoto2-2.3.1-r1.ebuild 4755 RMD160 32605f54025437c8409d73dbed9912487bffb20e SHA1 1a0331ca9e1c805910c4c103a9cf17cb260f67e8 SHA256 e00eb860db0079ebc0628f8eeb76a3ad2f6f3b9e1f5def588638747b0317b938
-MD5 7efcb211432631d7e9379e4c4e14b78f libgphoto2-2.3.1-r1.ebuild 4755
-RMD160 32605f54025437c8409d73dbed9912487bffb20e libgphoto2-2.3.1-r1.ebuild 4755
-SHA256 e00eb860db0079ebc0628f8eeb76a3ad2f6f3b9e1f5def588638747b0317b938 libgphoto2-2.3.1-r1.ebuild 4755
-MISC ChangeLog 14221 RMD160 cbe0f1e6fdd8648ec05678e1d9a99b5aacaa1516 SHA1 ef6de8ba251da2cffa0d95809d286f648ffd6857 SHA256 3da43941e7c5ac112d6b8c0af8788349c7bd4943829693ae2ef2ffa3d75b1b77
-MD5 a55efcd7b4b979d8cd8030dc28700884 ChangeLog 14221
-RMD160 cbe0f1e6fdd8648ec05678e1d9a99b5aacaa1516 ChangeLog 14221
-SHA256 3da43941e7c5ac112d6b8c0af8788349c7bd4943829693ae2ef2ffa3d75b1b77 ChangeLog 14221
+EBUILD libgphoto2-2.3.1-r1.ebuild 4857 RMD160 53585fa362522a24fca37b4391b1ffa7b783272a SHA1 b5ed52a8be0a39ebaaf6c565cf41df783b76124e SHA256 d4d63312598c2269c256cbea7239fd14d3c7d1df382283b9717f588d51e06254
+MD5 f389bedda52542a59c6b7590005d6a03 libgphoto2-2.3.1-r1.ebuild 4857
+RMD160 53585fa362522a24fca37b4391b1ffa7b783272a libgphoto2-2.3.1-r1.ebuild 4857
+SHA256 d4d63312598c2269c256cbea7239fd14d3c7d1df382283b9717f588d51e06254 libgphoto2-2.3.1-r1.ebuild 4857
+MISC ChangeLog 14380 RMD160 8da8be65c58e1e5394e7eba290b7fc9e8837434a SHA1 ee72899e17ceb4045419ebe70a1b1ca3dd36d4a4 SHA256 2e07d931d8be18a087543436808516369c3ca544fd6099154cfa8e69640bde27
+MD5 bf9603ab24aba222cd0429a8573b5b54 ChangeLog 14380
+RMD160 8da8be65c58e1e5394e7eba290b7fc9e8837434a ChangeLog 14380
+SHA256 2e07d931d8be18a087543436808516369c3ca544fd6099154cfa8e69640bde27 ChangeLog 14380
 MISC metadata.xml 273 RMD160 ba47ae4270a03bdca07255550d34c988816001bf SHA1 5edf5229a614bb7b9667d0dc64d455f9c282fa56 SHA256 a6bef8cc7f89558f4236d2a7507e97e966e38b31c8dffcd65f7a428f5fe96623
 MD5 7e59357e866fde5180e2184134acafdc metadata.xml 273
 RMD160 ba47ae4270a03bdca07255550d34c988816001bf metadata.xml 273
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"
 }