improved description (bug #140720) suggested by Christian 'Opfer' Faulhammer and removed older versions

(Portage version: 2.1.1_pre3-r4)
 (Signed Manifest commit)

8 files changed, 12 insertions, 210 deletions

diff --git a/media-libs/libptp2/Manifest b/media-libs/libptp2/Manifest
index f11905cbc48f..3cf5236b0093 100644
--- a/media-libs/libptp2/Manifest
+++ b/media-libs/libptp2/Manifest
@@ -1,18 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libptp2-1.0.1-libusbversion.patch 470 RMD160 3555de9382986c135a960df7d90ea1e679ac0081 SHA1 a3cdff8c7f4b1157cf13d24f5d5f6663479347e3 SHA256 e012c034ab67f65d0f899f145bc849b52e0037a56505bd64af4df6f4c0623477
-MD5 8138ffc75e460e62c0818880936a84af files/libptp2-1.0.1-libusbversion.patch 470
-RMD160 3555de9382986c135a960df7d90ea1e679ac0081 files/libptp2-1.0.1-libusbversion.patch 470
-SHA256 e012c034ab67f65d0f899f145bc849b52e0037a56505bd64af4df6f4c0623477 files/libptp2-1.0.1-libusbversion.patch 470
-AUX libptp2-1.0.2-libusbversion.patch 495 RMD160 87d2576122e3a6eedf57155349ecc34f932bf84c SHA1 a7e9ebb087b5b5168df2823ee2999bebcb0b7655 SHA256 4112845e92a1dc2ecc0d7510bd43f77fef686933fb5606d1d9ca55c47e3672db
-MD5 1ceef90a5e44b56ab54b1e8634695d6c files/libptp2-1.0.2-libusbversion.patch 495
-RMD160 87d2576122e3a6eedf57155349ecc34f932bf84c files/libptp2-1.0.2-libusbversion.patch 495
-SHA256 4112845e92a1dc2ecc0d7510bd43f77fef686933fb5606d1d9ca55c47e3672db files/libptp2-1.0.2-libusbversion.patch 495
-AUX libptp2-1.0.2-parallel.patch 2797 RMD160 9543991362cfef1769bc341de053491b04c9cf26 SHA1 89d8e3cac75500589e2ff1ae1137232e87e5ce01 SHA256 1fe757e53abb8fe12b4dca848f5995aeee2d21bf758b9b792b57017ef412983c
-MD5 040d61e7bc729957412db55415d36f0c files/libptp2-1.0.2-parallel.patch 2797
-RMD160 9543991362cfef1769bc341de053491b04c9cf26 files/libptp2-1.0.2-parallel.patch 2797
-SHA256 1fe757e53abb8fe12b4dca848f5995aeee2d21bf758b9b792b57017ef412983c files/libptp2-1.0.2-parallel.patch 2797
 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
@@ -25,42 +13,26 @@ 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
-DIST libptp2-1.0.1.tar.gz 347569
-DIST libptp2-1.0.2.tar.gz 353893
 DIST libptp2-1.1.0.tar.gz 359744 RMD160 019647941e8443aebd701dd18fd8afc6128089de SHA1 d020055017227613359a35e7c37b0f164db5349d SHA256 a65414e83a15e99129ad1d749eb6f481462422c22be7f36819d3049abd0c1b90
-EBUILD libptp2-1.0.1.ebuild 984 RMD160 6bdee75a386e8f44a215ab67244811b39ea9813e SHA1 64d287c68193bdbd7f179ef3d40b284f4ed1cac1 SHA256 bf193412888dfb03f408d100f07276c885668849b694b2331a6a1922c7c8551d
-MD5 df0c4e3c054f1496afede819ee11f992 libptp2-1.0.1.ebuild 984
-RMD160 6bdee75a386e8f44a215ab67244811b39ea9813e libptp2-1.0.1.ebuild 984
-SHA256 bf193412888dfb03f408d100f07276c885668849b694b2331a6a1922c7c8551d libptp2-1.0.1.ebuild 984
-EBUILD libptp2-1.0.2.ebuild 1032 RMD160 439572f77442a9287992cec7e477b01bb55a6cf7 SHA1 0230dfc7fbd77c6c8b7de5fb0be7ceba31c30e7a SHA256 b265eb1bade650e51a22803cd71a86dccdf7f0ade8902131dc0f328154b1446d
-MD5 8f0341bbba19e6e04eaa43fae8c62dea libptp2-1.0.2.ebuild 1032
-RMD160 439572f77442a9287992cec7e477b01bb55a6cf7 libptp2-1.0.2.ebuild 1032
-SHA256 b265eb1bade650e51a22803cd71a86dccdf7f0ade8902131dc0f328154b1446d libptp2-1.0.2.ebuild 1032
-EBUILD libptp2-1.1.0.ebuild 1106 RMD160 71645cddde7d70df671931a0cd8091f59007dc68 SHA1 c2f45fb71f785194c4e1d5c8bc3d5a4a45deb942 SHA256 f4bcfa3e4fbd2ce40b38fd98fbe148e94e2cc5e5184739e795ae8cda548b90f8
-MD5 9062cadf30a69ac12747dc634a108d88 libptp2-1.1.0.ebuild 1106
-RMD160 71645cddde7d70df671931a0cd8091f59007dc68 libptp2-1.1.0.ebuild 1106
-SHA256 f4bcfa3e4fbd2ce40b38fd98fbe148e94e2cc5e5184739e795ae8cda548b90f8 libptp2-1.1.0.ebuild 1106
-MISC ChangeLog 2248 RMD160 3437767b6f5acd448f7af1b8b22e6821209c2ce7 SHA1 4251176987c46da317f39c6fb85199fd072e6e56 SHA256 13bcfbe034f045d0f222bf2f3930cf3af1ea3737cc70799f990deffde422a9b9
-MD5 d96aa796d52d394d3a42a7b2ab3ab620 ChangeLog 2248
-RMD160 3437767b6f5acd448f7af1b8b22e6821209c2ce7 ChangeLog 2248
-SHA256 13bcfbe034f045d0f222bf2f3930cf3af1ea3737cc70799f990deffde422a9b9 ChangeLog 2248
+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
 MISC metadata.xml 403 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 SHA1 ec604212b5eb7dde6256c827184a228eaa8161d5 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a
 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
 RMD160 48afb924f8ddebfd4ea31a43eca3b277a30b62b6 metadata.xml 403
 SHA256 148b8bb5514a7787fab372ad8a71c93c67db9ce84ed2aa5953691c2104ca788a metadata.xml 403
-MD5 20edc79b41d07fe8e2db6a2448c7e2cf files/digest-libptp2-1.0.1 65
-RMD160 9d712e8813909fd3582c4a7370da60f172fd9dbd files/digest-libptp2-1.0.1 65
-SHA256 c61114a34c00d4e0ae4b6a0b2eab4cb4bec62e6b919d2ee61c230e09dfb0fdef files/digest-libptp2-1.0.1 65
-MD5 a6f70bf32535c44ad3f82a74e5232021 files/digest-libptp2-1.0.2 65
-RMD160 534207abd7d3f32e95536f6fce5883c62c7bdd17 files/digest-libptp2-1.0.2 65
-SHA256 8f0f3af25ec9be2bc6b50be2a851f81f91fc731dd3cc2c68f20fe61c7fe689de files/digest-libptp2-1.0.2 65
 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.2.2 (GNU/Linux)
+Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFExZ252ZWR0Jhg/EsRAmnfAJ4pBqZsll9vdUCpf40fu8KYan9zSgCfbsoc
-Vx8B+VEDGN69taGYINJnbO4=
-=zLPe
+iD8DBQFExaKHmdTrptrqvGERAkHoAJ0QBIbEq4bOJ9laRHTU5dY+vAmEbgCfSWrX
+WDoMhseUvrJegeAB9sf4LdY=
+=uhLa
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libptp2/files/digest-libptp2-1.0.1 b/media-libs/libptp2/files/digest-libptp2-1.0.1
deleted file mode 100644
index 037a67fee084..000000000000
--- a/media-libs/libptp2/files/digest-libptp2-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 554c7e9b568f06a43d3af69da5e0103c libptp2-1.0.1.tar.gz 347569
diff --git a/media-libs/libptp2/files/digest-libptp2-1.0.2 b/media-libs/libptp2/files/digest-libptp2-1.0.2
deleted file mode 100644
index 9ba8629a8855..000000000000
--- a/media-libs/libptp2/files/digest-libptp2-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index d5f9eb8d8e1a..000000000000
--- a/media-libs/libptp2/files/libptp2-1.0.1-libusbversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 434a9a3d4d8c..000000000000
--- a/media-libs/libptp2/files/libptp2-1.0.2-libusbversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/libptp2-1.0.2-parallel.patch b/media-libs/libptp2/files/libptp2-1.0.2-parallel.patch
deleted file mode 100644
index 3568d025b8fa..000000000000
--- a/media-libs/libptp2/files/libptp2-1.0.2-parallel.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- 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.1.ebuild b/media-libs/libptp2/libptp2-1.0.1.ebuild
deleted file mode 100644
index 2bd472673226..000000000000
--- a/media-libs/libptp2/libptp2-1.0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.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="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/ ./ptpcam -l || die "failed test"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die
-}
diff --git a/media-libs/libptp2/libptp2-1.0.2.ebuild b/media-libs/libptp2/libptp2-1.0.2.ebuild
deleted file mode 100644
index 5939f3b0c1cc..000000000000
--- a/media-libs/libptp2/libptp2-1.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.4 2005/09/12 22:48:22 hansmi 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
-	cd ${S}
-	epatch ${FILESDIR}/${P}-parallel.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
-}