version bump as requested by cmuelle8 and Wolfgang Goetz in bug #202831

Package-Manager: portage-2.1.3.19

6 files changed, 223 insertions, 16 deletions

diff --git a/media-libs/libptp2/ChangeLog b/media-libs/libptp2/ChangeLog
index e41c0db0fc9e..19270d25cbce 100644
--- a/media-libs/libptp2/ChangeLog
+++ b/media-libs/libptp2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libptp2
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/ChangeLog,v 1.15 2006/07/25 04:47:20 dragonheart Exp $
+# 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 $
+
+*libptp2-1.1.10 (28 Dec 2007)
+
+  28 Dec 2007; Daniel Black <dragonheart@gentoo.org>
+  +files/libptp2-1.1.10-configure.patch,
+  +files/libptp2-1.1.10-makefile.patch, +libptp2-1.1.10.ebuild:
+  version bump as requested by cmuelle8 and Wolfgang Goetz in bug #202831
 
   25 Jul 2006; Daniel Black <dragonheart@gentoo.org>
   -files/libptp2-1.0.1-libusbversion.patch,
diff --git a/media-libs/libptp2/Manifest b/media-libs/libptp2/Manifest
index 3cf5236b0093..3166afd663f4 100644
--- a/media-libs/libptp2/Manifest
+++ b/media-libs/libptp2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libptp2-1.1.0-gcc41.patch 1164 RMD160 8d96b40db7f010cbbe362e86e4eb1f1003781089 SHA1 ac702dfff3a234fa9fd7077d684fe8ad647e2fd9 SHA256 cdbe5d9efcfd6acbbf2dba3634697f78c1936f9df5a10e79bfe294aac7f29588
 MD5 d810c23a1b28674b118051656e9ad519 files/libptp2-1.1.0-gcc41.patch 1164
 RMD160 8d96b40db7f010cbbe362e86e4eb1f1003781089 files/libptp2-1.1.0-gcc41.patch 1164
@@ -13,15 +10,28 @@ AUX libptp2-1.1.0-parallel.patch 2310 RMD160 c8241e43683aadd88844095cffda4cfd9c4
 MD5 ea29f511dde15496bd7a1ef5f4edbfa7 files/libptp2-1.1.0-parallel.patch 2310
 RMD160 c8241e43683aadd88844095cffda4cfd9c41bb16 files/libptp2-1.1.0-parallel.patch 2310
 SHA256 efe73c16367beb4773f305a35b158e28cecf5a158e785fd249673810255d5510 files/libptp2-1.1.0-parallel.patch 2310
+AUX libptp2-1.1.10-configure.patch 1119 RMD160 637b6d924daea7235b92290867b3c789977ab8a6 SHA1 fce2a9b9e5b80e5376ab821d73c2a3c012c94454 SHA256 a6a4f62d59d92371c0950dd267751400a3db1106010df4a973ea4651c9ea40d2
+MD5 ad509f832116852aa3db2d5585c9db8b files/libptp2-1.1.10-configure.patch 1119
+RMD160 637b6d924daea7235b92290867b3c789977ab8a6 files/libptp2-1.1.10-configure.patch 1119
+SHA256 a6a4f62d59d92371c0950dd267751400a3db1106010df4a973ea4651c9ea40d2 files/libptp2-1.1.10-configure.patch 1119
+AUX libptp2-1.1.10-makefile.patch 3594 RMD160 0f9e4b7ba83e18ea91dfd8cc319baf4ad5450d8c SHA1 930bc742d04d2a43b6cb05bfc8a5c3328605111f SHA256 fd26a7385d9158dfa01a16131e0ee64d73b2cef27ded34260d9d20ba1888fca0
+MD5 6ea7e83b80d5a324797561cf7ad9cb3c files/libptp2-1.1.10-makefile.patch 3594
+RMD160 0f9e4b7ba83e18ea91dfd8cc319baf4ad5450d8c files/libptp2-1.1.10-makefile.patch 3594
+SHA256 fd26a7385d9158dfa01a16131e0ee64d73b2cef27ded34260d9d20ba1888fca0 files/libptp2-1.1.10-makefile.patch 3594
 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
 MD5 17f81a445ba51388a1fc64e9e69f7e3f libptp2-1.1.0.ebuild 1121
 RMD160 2d9e734cbe970315945c18b1c32dbe58ba4c4e8e libptp2-1.1.0.ebuild 1121
 SHA256 f3138a6effe579896812bae1769f3b4c01df6aa511991279e392da37f0c73d65 libptp2-1.1.0.ebuild 1121
-MISC ChangeLog 2612 RMD160 09965800206621e70604b0153d1bb203a73aba14 SHA1 0fcfe8a308b869048a0b1a408f7207620502f446 SHA256 e70008b34f744a1d5ab8b233897394389b66b552265197555716b1b140828733
-MD5 7e045108eb6ed726a5dfa6fa6e4eb0b3 ChangeLog 2612
-RMD160 09965800206621e70604b0153d1bb203a73aba14 ChangeLog 2612
-SHA256 e70008b34f744a1d5ab8b233897394389b66b552265197555716b1b140828733 ChangeLog 2612
+EBUILD libptp2-1.1.10.ebuild 881 RMD160 6ef6f0c0c1ce324cda383b90956928bf19b820fc SHA1 5708d944c3e183c5d0d4ec7677c6ece7c1ba6c14 SHA256 26c31f9c5df8f920ccaad80f9bdc94343e98818ea6960bdd2f1277e6a6c3e7b9
+MD5 3e4c16426f6f5d233e76a1051dd9f3ae libptp2-1.1.10.ebuild 881
+RMD160 6ef6f0c0c1ce324cda383b90956928bf19b820fc libptp2-1.1.10.ebuild 881
+SHA256 26c31f9c5df8f920ccaad80f9bdc94343e98818ea6960bdd2f1277e6a6c3e7b9 libptp2-1.1.10.ebuild 881
+MISC ChangeLog 2876 RMD160 16aa545b499fed78b43aa0d0ad68cb09f2eabde5 SHA1 9ccbf93278376024c73643f88b8dca269343265e SHA256 3d2edcb54921ba2a1da76a83a607bd222cef256c1464bf144e4f7126bdc41e6f
+MD5 d572a23bf923f9aa2338ea26b6c383ff ChangeLog 2876
+RMD160 16aa545b499fed78b43aa0d0ad68cb09f2eabde5 ChangeLog 2876
+SHA256 3d2edcb54921ba2a1da76a83a607bd222cef256c1464bf144e4f7126bdc41e6f ChangeLog 2876
 MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 metadata.xml 403
@@ -29,10 +39,6 @@ SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a metadata
 MD5 c366f36d73ab3488c14478fcf6722a3a files/digest-libptp2-1.1.0 241
 RMD160 6914f4f22a4e928b8266c4cd2597bb68fe20187c files/digest-libptp2-1.1.0 241
 SHA256 38e0fd2a37b94ddc8ec86d4f6bbe7b58965c69187395ef6870f16f9f86d0be78 files/digest-libptp2-1.1.0 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFExaKHmdTrptrqvGERAkHoAJ0QBIbEq4bOJ9laRHTU5dY+vAmEbgCfSWrX
-WDoMhseUvrJegeAB9sf4LdY=
-=uhLa
------END PGP SIGNATURE-----
+MD5 ae2380c89c31d09f083f4d9fbd6f5b21 files/digest-libptp2-1.1.10 244
+RMD160 b26a0b09d12dffcab4acc92901d15a19ce47d90a files/digest-libptp2-1.1.10 244
+SHA256 d6b2bef3a68199b9e1bd61d37aeeb3d13711f845cfe88d95e8f305d3b012ee99 files/digest-libptp2-1.1.10 244
diff --git a/media-libs/libptp2/files/digest-libptp2-1.1.10 b/media-libs/libptp2/files/digest-libptp2-1.1.10
new file mode 100644
index 000000000000..5f0c277187a7
--- /dev/null
+++ b/media-libs/libptp2/files/digest-libptp2-1.1.10
@@ -0,0 +1,3 @@
+MD5 5a0e2965d1077c316d6ae6a8cef96238 libptp2-1.1.10.tar.gz 380767
+RMD160 f29a1422e096e3376e141a72c2f916abc0446843 libptp2-1.1.10.tar.gz 380767
+SHA256 ce9c0c220a24ffecd4c4a2563de9e78137965bc2118c3de53dbfd928cfd92e74 libptp2-1.1.10.tar.gz 380767
diff --git a/media-libs/libptp2/files/libptp2-1.1.10-configure.patch b/media-libs/libptp2/files/libptp2-1.1.10-configure.patch
new file mode 100644
index 000000000000..d8f1260f5e34
--- /dev/null
+++ b/media-libs/libptp2/files/libptp2-1.1.10-configure.patch
@@ -0,0 +1,46 @@
+--- libptp2-1.1.10/configure.in.orig	2007-12-28 10:28:36.000000000 +1100
++++ libptp2-1.1.10/configure.in	2007-12-28 10:36:14.000000000 +1100
+@@ -25,6 +25,10 @@
+ 
+ # Checks for programs.
+ AC_PROG_CC
++AC_PROG_INSTALL
++AC_PROG_LN_S
++AC_PROG_MAKE_SET
++AC_PROG_RANLIB
+ 
+ # turn on warnings for gcc
+ if test "$ac_cv_prog_gcc" = "yes"; then
+@@ -36,19 +40,29 @@
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([libintl.h stdlib.h string.h])
++AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h stdint.h stdlib.h string.h sys/ioctl.h unistd.h utime.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
++AC_TYPE_INT16_T
++AC_TYPE_INT32_T
++AC_TYPE_INT8_T
+ AC_STRUCT_TM
++AC_TYPE_UINT16_T
++AC_TYPE_UINT32_T
++AC_TYPE_UINT64_T
++AC_TYPE_UINT8_T
+ 
+ # Checks for library functions.
+-AC_FUNC_ERROR_AT_LINE
++AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MALLOC
+ AC_FUNC_MKTIME
++AC_FUNC_MMAP
++AC_TYPE_SIGNAL
++AC_FUNC_UTIME_NULL
+ AC_FUNC_VPRINTF
+-AC_CHECK_FUNCS([memset strchr strdup strtol getopt_long])
++AC_CHECK_FUNCS([memset munmap strdup strncasecmp strtol utime])
+ 
+ hostos=any
+ case $host in
diff --git a/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch
new file mode 100644
index 000000000000..72253e3e589b
--- /dev/null
+++ b/media-libs/libptp2/files/libptp2-1.1.10-makefile.patch
@@ -0,0 +1,114 @@
+--- libptp2-1.1.10.orig/src/Makefile.am	2005-11-01 02:39:40.000000000 +1100
++++ libptp2-1.1.10/src/Makefile.am	2007-12-28 09:51:01.000000000 +1100
+@@ -17,7 +17,7 @@
+ else 
+ ptpcam_SOURCES = ptpcam.c ptpcam.h
+ endif
+-ptpcam_LDADD = -lptp2 @PTPCAM_LDFLAGS@
++ptpcam_LDADD = libptp2.la @PTPCAM_LDFLAGS@
+ 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
diff --git a/media-libs/libptp2/libptp2-1.1.10.ebuild b/media-libs/libptp2/libptp2-1.1.10.ebuild
new file mode 100644
index 000000000000..80a328f13e5e
--- /dev/null
+++ b/media-libs/libptp2/libptp2-1.1.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libptp2/libptp2-1.1.10.ebuild,v 1.1 2007/12/28 00:03:07 dragonheart Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Library and client for communicating with PTP enabled devices (e.g. digital photo cameras)."
+HOMEPAGE="http://sourceforge.net/projects/libptp/"
+SRC_URI="mirror://sourceforge/libptp/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND=">=dev-libs/libusb-0.1.10"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+	cd "${S}"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_test() {
+	env LD_LIBRARY_PATH=./src/.libs/ ./src/ptpcam -l || die "failed test"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}