autotools fixed thanks Diego - bug #226753

Package-Manager: portage-2.1.4.4

3 files changed, 8 insertions, 107 deletions

diff --git a/media-libs/libptp2/ChangeLog b/media-libs/libptp2/ChangeLog
index 19270d25cbce..edd277860c4d 100644
--- a/media-libs/libptp2/ChangeLog
+++ b/media-libs/libptp2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libptp2
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/ChangeLog,v 1.16 2007/12/28 00:03:07 dragonheart Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/ChangeLog,v 1.17 2008/06/20 14:11:04 dragonheart Exp $
+
+  20 Jun 2008; Daniel Black <dragonheart@gentoo.org>
+  files/libptp2-1.1.10-makefile.patch:
+  autotools fixed thanks Diego - bug #226753
 
 *libptp2-1.1.10 (28 Dec 2007)
 
diff --git a/media-libs/libptp2/Manifest b/media-libs/libptp2/Manifest
index e367b6fde2b3..5de3ce89a2bd 100644
--- a/media-libs/libptp2/Manifest
+++ b/media-libs/libptp2/Manifest
@@ -2,10 +2,10 @@ AUX libptp2-1.1.0-gcc41.patch 1164 RMD160 8d96b40db7f010cbbe362e86e4eb1f10037810
 AUX libptp2-1.1.0-libusbversion.patch 498 RMD160 2ea31b48d8275e30235774f76aab9471a292e5b7 SHA1 16cbcf3a6231b74799df3825f32b7906cd6ef37e SHA256 68d5852f03a9d1f240219e38ecb4e3b7cbf9d85525cfde6740348d2d19160caa
 AUX libptp2-1.1.0-parallel.patch 2310 RMD160 c8241e43683aadd88844095cffda4cfd9c41bb16 SHA1 0889eb1a4bf05c1c8b4e05385cfb2f4269e40bad SHA256 efe73c16367beb4773f305a35b158e28cecf5a158e785fd249673810255d5510
 AUX libptp2-1.1.10-configure.patch 1119 RMD160 637b6d924daea7235b92290867b3c789977ab8a6 SHA1 fce2a9b9e5b80e5376ab821d73c2a3c012c94454 SHA256 a6a4f62d59d92371c0950dd267751400a3db1106010df4a973ea4651c9ea40d2
-AUX libptp2-1.1.10-makefile.patch 3594 RMD160 0f9e4b7ba83e18ea91dfd8cc319baf4ad5450d8c SHA1 930bc742d04d2a43b6cb05bfc8a5c3328605111f SHA256 fd26a7385d9158dfa01a16131e0ee64d73b2cef27ded34260d9d20ba1888fca0
+AUX libptp2-1.1.10-makefile.patch 373 RMD160 6757619e944c206b878465a04757b5160375e28a SHA1 404dad162b541b4b60aa2addb1959fd6363f4d52 SHA256 aa74a7149fbcba2998d9a63809f3b94a939fc3600eb15b3409db17cf612f31d5
 DIST libptp2-1.1.0.tar.gz 359744 RMD160 019647941e8443aebd701dd18fd8afc6128089de SHA1 d020055017227613359a35e7c37b0f164db5349d SHA256 a65414e83a15e99129ad1d749eb6f481462422c22be7f36819d3049abd0c1b90
 DIST libptp2-1.1.10.tar.gz 380767 RMD160 f29a1422e096e3376e141a72c2f916abc0446843 SHA1 b671b029c869b330780f4ebb0cb91d0a850946a1 SHA256 ce9c0c220a24ffecd4c4a2563de9e78137965bc2118c3de53dbfd928cfd92e74
 EBUILD libptp2-1.1.0.ebuild 1121 RMD160 2d9e734cbe970315945c18b1c32dbe58ba4c4e8e SHA1 7db4622554bd813adf4bcf9dc8e0d52cb76d855d SHA256 f3138a6effe579896812bae1769f3b4c01df6aa511991279e392da37f0c73d65
 EBUILD libptp2-1.1.10.ebuild 881 RMD160 6ef6f0c0c1ce324cda383b90956928bf19b820fc SHA1 5708d944c3e183c5d0d4ec7677c6ece7c1ba6c14 SHA256 26c31f9c5df8f920ccaad80f9bdc94343e98818ea6960bdd2f1277e6a6c3e7b9
-MISC ChangeLog 2876 RMD160 16aa545b499fed78b43aa0d0ad68cb09f2eabde5 SHA1 9ccbf93278376024c73643f88b8dca269343265e SHA256 3d2edcb54921ba2a1da76a83a607bd222cef256c1464bf144e4f7126bdc41e6f
+MISC ChangeLog 3014 RMD160 371a6384a99a4092c3346814fed4cabb61e03644 SHA1 a0a81567d561f265c3cde38e2ab791563b321985 SHA256 61a6397baca0743d8bae91144ac1dfb4497b2afb1e76b7a79426b898cb1d090a
 MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a
diff --git a/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch
index 72253e3e589b..0e7b5adec8fc 100644
--- a/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch
+++ b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch
@@ -9,106 +9,3 @@
  ptpcam_DEPENDANCIES = libptp2.la
  ptpcam_CFLAGS = @PTPCAM_CFLAGS@
  endif
---- libptp2-1.1.10.orig/src/Makefile.in	2007-08-27 01:08:33.000000000 +1000
-+++ libptp2-1.1.10/src/Makefile.in	2007-12-28 09:52:05.000000000 +1100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -16,8 +16,6 @@
- 
- 
- 
--SOURCES = $(libptp2_la_SOURCES) $(ptpcam_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -45,8 +43,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 = $(install_sh) -d
-@@ -74,7 +71,7 @@
- @LINUX_OS_TRUE@@PTPCAM_TRUE@	ptpcam-ptpcam.$(OBJEXT) \
- @LINUX_OS_TRUE@@PTPCAM_TRUE@	ptpcam-myusb.$(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
-@@ -122,6 +119,7 @@
- EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
-+GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -150,16 +148,14 @@
- PTPCAM_LDFLAGS = @PTPCAM_LDFLAGS@
- PTPCAM_TRUE = @PTPCAM_TRUE@
- RANLIB = @RANLIB@
-+SED = @SED@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
- VERSION = @VERSION@
--ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
- am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
- am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
- am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-@@ -176,24 +172,30 @@
- build_os = @build_os@
- build_vendor = @build_vendor@
- datadir = @datadir@
--effective_target = @effective_target@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
-@@ -207,7 +209,7 @@
- DISTCLEANFILES = libptp-stdint.h libptp-endian.h
- @LINUX_OS_FALSE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h
- @LINUX_OS_TRUE@@PTPCAM_TRUE@ptpcam_SOURCES = ptpcam.c ptpcam.h myusb.c
--@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