fixed parallel make (bug #104708). x86 stable on 1.0.2

(Portage version: 2.0.51.22-r2)

4 files changed, 86 insertions, 15 deletions

diff --git a/media-libs/libptp2/ChangeLog b/media-libs/libptp2/ChangeLog
index 2630e79ae32b..5e62031998c1 100644
--- a/media-libs/libptp2/ChangeLog
+++ b/media-libs/libptp2/ChangeLog
@@ -1,6 +1,10 @@
 # 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.6 2005/06/16 14:13:12 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/ChangeLog,v 1.7 2005/09/03 23:04:46 dragonheart Exp $
+
+  03 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/libptp2-1.0.2-parallel.patch, libptp2-1.0.2.ebuild:
+  fixed parallel make (bug #104708). x86 stable on 1.0.2. Thanks Marco Nierlich
 
 *libptp2-1.0.2 (16 Jun 2005)
 
diff --git a/media-libs/libptp2/Manifest b/media-libs/libptp2/Manifest
index 0d893d598d2a..60c856aadcd4 100644
--- a/media-libs/libptp2/Manifest
+++ b/media-libs/libptp2/Manifest
@@ -1,18 +1,9 @@
------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 186496fddd5924650ba3890e6f8d4ec9 ChangeLog 1315
+MD5 d6cff6e06143ecf31e2a17d1ed03fa23 libptp2-1.0.2.ebuild 1040
 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-----
+MD5 040d61e7bc729957412db55415d36f0c files/libptp2-1.0.2-parallel.patch 2797
diff --git a/media-libs/libptp2/files/libptp2-1.0.2-parallel.patch b/media-libs/libptp2/files/libptp2-1.0.2-parallel.patch
new file mode 100644
index 000000000000..3568d025b8fa
--- /dev/null
+++ b/media-libs/libptp2/files/libptp2-1.0.2-parallel.patch
@@ -0,0 +1,74 @@
+--- src/Makefile.am.orig	2005-09-04 08:49:40.000000000 +1000
++++ src/Makefile.am	2005-09-04 08:50:51.000000000 +1000
+@@ -13,6 +13,7 @@
+ if PTPCAM
+ bin_PROGRAMS = ptpcam
+ ptpcam_SOURCES = ptpcam.c ptpcam.h
+-ptpcam_LDADD = -lptp2 @PTPCAM_LDFLAGS@
++ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
++ptpcam_DEPENDANCIES = libptp2.la
+ ptpcam_CFLAGS = @PTPCAM_CFLAGS@
+ endif
+--- src/Makefile.in.orig	2005-09-04 08:51:05.000000000 +1000
++++ src/Makefile.in	2005-09-04 08:52:24.000000000 +1000
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.8.4 from Makefile.am.
++# Makefile.in generated by automake 1.8.5 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -44,8 +44,7 @@
+ DIST_COMMON = $(libptp2include_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/./m4/byteorder.m4 \
+-	$(top_srcdir)/./m4/stdint.m4 $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ mkinstalldirs = $(mkdir_p)
+@@ -62,7 +61,7 @@
+ am__ptpcam_SOURCES_DIST = ptpcam.c ptpcam.h
+ @PTPCAM_TRUE@am_ptpcam_OBJECTS = ptpcam-ptpcam.$(OBJEXT)
+ ptpcam_OBJECTS = $(am_ptpcam_OBJECTS)
+-ptpcam_DEPENDENCIES =
++@PTPCAM_TRUE@ptpcam_DEPENDENCIES = libptp2.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -162,7 +161,6 @@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
+-effective_target = @effective_target@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+@@ -192,7 +190,8 @@
+ libptp2include_HEADERS = ptp.h libptp-endian.h libptp-stdint.h
+ DISTCLEANFILES = libptp-stdint.h libptp-endian.h
+ @PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h
+-@PTPCAM_TRUE@ptpcam_LDADD = -lptp2 @PTPCAM_LDFLAGS@
++@PTPCAM_TRUE@ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
++@PTPCAM_TRUE@ptpcam_DEPENDANCIES = libptp2.la
+ @PTPCAM_TRUE@ptpcam_CFLAGS = @PTPCAM_CFLAGS@
+ all: all-am
+ 
+@@ -250,7 +249,7 @@
+ 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
++	  test "$$dir" != "$$p" || dir=.; \
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+@@ -393,7 +392,7 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+-	  test -z "$$unique" && unique=$$empty_fix; \
++	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	    $$tags $$unique; \
+ 	fi
diff --git a/media-libs/libptp2/libptp2-1.0.2.ebuild b/media-libs/libptp2/libptp2-1.0.2.ebuild
index 792512f3416f..134f3834a4fc 100644
--- a/media-libs/libptp2/libptp2-1.0.2.ebuild
+++ b/media-libs/libptp2/libptp2-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/libptp2-1.0.2.ebuild,v 1.2 2005/09/03 23:04:46 dragonheart Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://sourceforge.net/projects/libptp/"
 SRC_URI="mirror://sourceforge/libptp/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~ppc64 ~x86"
+KEYWORDS="~ppc ~ppc64 x86"
 IUSE=""
 RDEPEND=">=dev-libs/libusb-0.1.8"
 DEPEND="${RDEPEND}
@@ -19,6 +19,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-libusbversion.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-parallel.patch
 }
 
 src_test() {