patch to make work with libusb-0.1.10a. Version bump also

Package-Manager: portage-2.0.51.22-r1

7 files changed, 98 insertions, 12 deletions

diff --git a/media-libs/libptp2/ChangeLog b/media-libs/libptp2/ChangeLog
index a4ce5a1b516e..2630e79ae32b 100644
--- a/media-libs/libptp2/ChangeLog
+++ b/media-libs/libptp2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libptp2
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/ChangeLog,v 1.5 2005/01/26 20:11:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/ChangeLog,v 1.6 2005/06/16 14:13:12 dragonheart Exp $
+
+*libptp2-1.0.2 (16 Jun 2005)
+
+  16 Jun 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/libptp2-1.0.1-libusbversion.patch,
+  +files/libptp2-1.0.2-libusbversion.patch, libptp2-1.0.1.ebuild,
+  +libptp2-1.0.2.ebuild:
+  patch to make work with libusb-0.1.10a (bug #95545) thanks to Jon White.
+  Version bump also
 
   26 Jan 2005; Markus Rothe <corsair@gentoo.org> libptp2-1.0.1.ebuild:
   Stable on ppc64
diff --git a/media-libs/libptp2/Manifest b/media-libs/libptp2/Manifest
index 60dcf51db5d6..0d893d598d2a 100644
--- a/media-libs/libptp2/Manifest
+++ b/media-libs/libptp2/Manifest
@@ -1,4 +1,18 @@
-MD5 90937ee647f76ae36570711fc2a74d9f ChangeLog 833
-MD5 d14123b7f4d04874615aa527d58441d0 libptp2-1.0.1.ebuild 909
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
+MD5 df0c4e3c054f1496afede819ee11f992 libptp2-1.0.1.ebuild 984
+MD5 6a6740b139056a14d7ee16c3699a7fd3 ChangeLog 1151
+MD5 69401846d90a5010dfda5be44e941ab2 libptp2-1.0.2.ebuild 991
 MD5 20edc79b41d07fe8e2db6a2448c7e2cf files/digest-libptp2-1.0.1 65
+MD5 a6f70bf32535c44ad3f82a74e5232021 files/digest-libptp2-1.0.2 65
+MD5 1ceef90a5e44b56ab54b1e8634695d6c files/libptp2-1.0.2-libusbversion.patch 495
+MD5 8138ffc75e460e62c0818880936a84af files/libptp2-1.0.1-libusbversion.patch 470
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCsYkQmdTrptrqvGERArj9AJ9TP0gI/+kPLj1Y69zESk4qb+aLygCgnehX
+mMwuOK+Pz7P1K3/pLbAkN8E=
+=+9mr
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libptp2/files/digest-libptp2-1.0.2 b/media-libs/libptp2/files/digest-libptp2-1.0.2
new file mode 100644
index 000000000000..9ba8629a8855
--- /dev/null
+++ b/media-libs/libptp2/files/digest-libptp2-1.0.2
@@ -0,0 +1 @@
+MD5 ff1942756846d02fd709011a9a29ff54 libptp2-1.0.2.tar.gz 353893
diff --git a/media-libs/libptp2/files/libptp2-1.0.1-libusbversion.patch b/media-libs/libptp2/files/libptp2-1.0.1-libusbversion.patch
new file mode 100644
index 000000000000..d5f9eb8d8e1a
--- /dev/null
+++ b/media-libs/libptp2/files/libptp2-1.0.1-libusbversion.patch
@@ -0,0 +1,11 @@
+--- libptp2-1.0.1/configure	2004-07-29 01:41:38.000000000 +1000
++++ libptp2-1.0.1.new/configure	2005-06-10 07:47:43.000000000 +1000
+@@ -21744,7 +21744,7 @@
+ 
+ 	fi
+ 
+-	if test "$LIBUSB_VER" \< "0.1.6"; then
++	if test "$LIBUSB_VER" \< "0.1.6" && test "$LIBUSB_VER" != "0.1.10a"; then
+ 		{ { echo "$as_me:$LINENO: error:
+ *** You need at least version 0.1.6 of the libusb library to build ptpcam.
+ *** Download and istall it from http://sourceforge.net/projects/libusb/ or
diff --git a/media-libs/libptp2/files/libptp2-1.0.2-libusbversion.patch b/media-libs/libptp2/files/libptp2-1.0.2-libusbversion.patch
new file mode 100644
index 000000000000..434a9a3d4d8c
--- /dev/null
+++ b/media-libs/libptp2/files/libptp2-1.0.2-libusbversion.patch
@@ -0,0 +1,11 @@
+--- libptp2-1.0.2/configure	2005-03-01 21:02:51.000000000 +1100
++++ libptp2-1.0.2.new/configure	2005-06-10 07:27:53.000000000 +1000
+@@ -21761,7 +21761,7 @@
+ 		LDFLAGS="$LDFLAGS_save"
+ 	fi
+ 
+-	if test "$LIBUSB_VER" \< "0.1.8"; then
++	if test "$LIBUSB_VER" \< "0.1.8" && test "$LIBUSB_VER" != "0.1.10a"; then
+ 		{ { echo "$as_me:$LINENO: error:
+ *** You need at least version 0.1.8 of the libusb library to build ptpcam.
+ *** Download and istall it from http://sourceforge.net/projects/libusb/ or
diff --git a/media-libs/libptp2/libptp2-1.0.1.ebuild b/media-libs/libptp2/libptp2-1.0.1.ebuild
index 651f89d54f75..2bd472673226 100644
--- a/media-libs/libptp2/libptp2-1.0.1.ebuild
+++ b/media-libs/libptp2/libptp2-1.0.1.ebuild
@@ -1,28 +1,33 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/libptp2-1.0.1.ebuild,v 1.5 2005/01/26 20:11:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/libptp2-1.0.1.ebuild,v 1.6 2005/06/16 14:13:12 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="Library communicating with PTP enabled devices (digital photo cameras and so on)."
 HOMEPAGE="http://sourceforge.net/projects/libptp/"
 SRC_URI="mirror://sourceforge/libptp/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ppc64"
+KEYWORDS="ppc ppc64 x86"
 IUSE=""
-RDEPEND="dev-libs/libusb"
+RDEPEND=">=dev-libs/libusb-0.1.8"
 DEPEND="${RDEPEND}
 	sys-apps/gawk
 	sys-apps/grep"
 
-src_compile() {
-	econf || die "failed to configure"
-	# Parallel make fails - 
-	# https://sourceforge.net/tracker/index.php?func=detail&aid=1009488&group_id=40071&atid=426963
-	emake -j1 || die "failed to make"
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-libusbversion.patch
 }
 
 src_test() {
-	env LD_LIBRARY_PATH=./usr/lib/ ./usr/bin/ptpcam -l || die "failed test"
+	if hasq userpriv "${FEATURES}" || hasq sandbox "${FEATURES}" || hasq usersandbox "${FEATURES}";
+	then
+		einfo "Sorry cannot test with userpriv, usersandbox or sandbox features"
+	else
+		env LD_LIBRARY_PATH=./src/.libs/ ./ptpcam -l || die "failed test"
+	fi
 }
 
 src_install() {
diff --git a/media-libs/libptp2/libptp2-1.0.2.ebuild b/media-libs/libptp2/libptp2-1.0.2.ebuild
new file mode 100644
index 000000000000..792512f3416f
--- /dev/null
+++ b/media-libs/libptp2/libptp2-1.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/libptp2-1.0.2.ebuild,v 1.1 2005/06/16 14:13:12 dragonheart Exp $
+
+inherit eutils
+
+DESCRIPTION="Library communicating with PTP enabled devices (digital photo cameras and so on)."
+HOMEPAGE="http://sourceforge.net/projects/libptp/"
+SRC_URI="mirror://sourceforge/libptp/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND=">=dev-libs/libusb-0.1.8"
+DEPEND="${RDEPEND}
+	sys-apps/gawk
+	sys-apps/grep"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-libusbversion.patch
+}
+
+src_test() {
+	if hasq userpriv "${FEATURES}" || hasq sandbox "${FEATURES}" || hasq usersandbox "${FEATURES}";
+	then
+		einfo "Sorry cannot test with userpriv, usersandbox or sandbox features"
+	else
+		env LD_LIBRARY_PATH=./src/.libs/ ./src/ptpcam -l || die "failed test"
+	fi
+}
+
+src_install() {
+	emake install DESTDIR=${D} || die
+}