Version bump wrt #521888 by Dimitri Semitsoglou-Tsiapos and Maik Nijhuis

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 121 insertions, 36 deletions

diff --git a/media-libs/libmtp/ChangeLog b/media-libs/libmtp/ChangeLog
index 758ad224101a..9774430e5801 100644
--- a/media-libs/libmtp/ChangeLog
+++ b/media-libs/libmtp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmtp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.150 2014/09/10 22:17:02 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.151 2014/09/27 21:50:58 ssuominen Exp $
+
+*libmtp-1.1.8 (27 Sep 2014)
+
+  27 Sep 2014; Samuli Suominen <ssuominen@gentoo.org> +libmtp-1.1.8.ebuild,
+  libmtp-9999.ebuild:
+  Version bump wrt #521888 by Dimitri Semitsoglou-Tsiapos and Maik Nijhuis
 
   10 Sep 2014; Rick Farina <zerochaos@gentoo.org> libmtp-1.1.6-r1.ebuild,
   libmtp-9999.ebuild:
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index ccd8cd83cacb..1f410cd08809 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,26 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libmtp-1.1.6-fbsdlibusb.patch 590 SHA256 536752f2c171a8e4ab3dd2ea92a16e793f5f46dc8ba7d95450f8c1348879b02f SHA512 79f8cd0a52119e7d4e9d12d11dac24c4ed83397cbf93f94e666bfce5dc7a082edc35a6a01863fe761ff567fa084e13515e45037ed90a4f7f745a3a4dd08281f2 WHIRLPOOL bfe3b025619bf58b81a34ec1716e80edb700402564a5adcb43b90a5905c78a4c312e815a74a34e55fb9a770f01e7c74a6a322dc9005bb0c059a58e68bfd8b556
 DIST libmtp-1.1.6.tar.gz 733519 SHA256 3a1c1c83af91de4052eb54feb795c141b4c04a252e0031954ebbf6175970cb0a SHA512 fe6d9bc0621d6ad2325164585ec5f3e20824add5ee763d6d14ba7dbea6d2aacd75afa450627f3a03691c33ffb92675abebce64c3f8e32e8c2db511e814207ab3 WHIRLPOOL 176f2d64241735f2de33da4d84142debb2343aeb3abbd27a2af8e2a1815aa239c5f4ed9f38316bd2a8deb9d8faad4e293a5abae46e54d9137bfe8fcba279b371
+DIST libmtp-1.1.8.tar.gz 757109 SHA256 3f9e87536aa40e560d0c153a505e38096b1df5ea15fad783691e9a8ca4dd2282 SHA512 34952fbe1ae1dcee456f4fc0d6208cf18e3ced22891bb748350927f06ee433f806e8339d6275085e70b6fd09a43eb0f18ac617e564c8d8162671245ecf0b8904 WHIRLPOOL 5ab0df9b566b7fe3193b0a09a0792eb2634d0775a8ee9a9358d13b2aeba4c82816f5ecb5e5d7355ed338d6171259b7a5c9802b4bc8ea2b0de3d4bbbd1aa8050c
 EBUILD libmtp-1.1.6-r1.ebuild 1539 SHA256 68812f52a4a4c345e9467f043aa111230e98a82c402d9e08f9b80f0e1478e364 SHA512 07eabcb2b656713a6ff4cf145802484923b27c9bce2595869aca670aa209905ceaa89da6e5b49a3ce687ad217aac3669fb062a5b1f5c78f70b813143ffbd92cb WHIRLPOOL b90145024396872bb89e92e1b424bf7d0ac285c88e451f58b96b3a621f22d076a7c80297fdcb30eae2942616ace3082a90796ec9aac10326b46f3f7a0a5d9e9a
-EBUILD libmtp-9999.ebuild 1497 SHA256 8631d5fdb115cf9ced72873b2964727196b32fbd1a5e0d18acddeb79f6b0731b SHA512 1496562748bffd01e063d3491dcc4d82028c657d96969ea383e303f0a3e746d6ff1f83c893a6aefaddf27ca597ba47d25aea517964dd2c51553bbf09de8afafa WHIRLPOOL 13ba529f42e1a877154048e94eb8953e642a870f1a916859cd17c4396b05824c4bb7f75a6c2b003e9ad87c226f35006d302d9453e4cde3c6f22ba6c8f9b43228
-MISC ChangeLog 18823 SHA256 0eb7c1aa2163d7a57160f12d9c30814538c97d4dca23b751d1f65477eceac0ef SHA512 cb960ad5c5e06c2f99f8745a80ed2c9ca0cfcf26ff9a6ab235f5602021ce4a5b11281aadb4eaabf27582f49a272f78830bb0bf7f6f75d10567691ae02bc81c2b WHIRLPOOL 8e0ef308c18c3ac48a4a21f6dd4c15820219d6c5b4b771565942ed68c31d45ba852844798fcd14a30c9f5ab6cf328afd15906338fdd6ee6d7a40960727d3b544
+EBUILD libmtp-1.1.8.ebuild 1783 SHA256 a3e895182944f445de204886a7516e8690bf8642311055e4fea47585d874d9dd SHA512 43927fbcf4d1499f156f247620c315783e5215ce9b3a4c226ffc60aa771af89fc7305cb83fc22f427bfc5cf5a3b11f73b425e4288ce661afd95e1c2942194c66 WHIRLPOOL 87dc26478ee2003057a86dbee64737382dcfa9e32aedf80d1fd17157e9ffe9acb92f962bf942b9a25fc11eef900b2b12f1183cbe1dcc73cee47bd70a5b02146d
+EBUILD libmtp-9999.ebuild 1783 SHA256 6a9c5fd9506c0d349d355f016ec2d81b777243ba40a95658a4bbb869fc756ae5 SHA512 ac3b6fba90c195621164d0a68f2bbd9e89ba0feb8d094a28524bd69535e8ee9c11fb8373fcee54efe667c2dedae721865c678638443cda102c1e66be60f8fd43 WHIRLPOOL 79b9e60d566de206a7b4275410e27629015a6d4e032f8179627234105a0874bcbec464b35262eee0a4f0ed21cdcd4045bc254be066b5fa4b4a4974397032dce3
+MISC ChangeLog 19026 SHA256 ba527a91b1b4d92cc8fd80de52402c673479e91bb40f365fe1af736475de7cd1 SHA512 312aaf2b79c9a969930de0ecf3af4a1084d0c12c6b959be0c8517d9073f4b8028dc29ee65572d38b31ce96890526996b6130db00f0eca424a5f8d3eaeddc01d1 WHIRLPOOL d2471a8e3e4fba9d057ee1f4a86f57f7edd76aad1bb13d08efc2617ed67ee3f9c4572031323ac142c69543fb564194868d64f6096cf7858a0d95ade8eea0f0e5
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJUEM4iAAoJEKXdFCfdEflKvp4QAIaYq4hEN0JfbPHqDSbFz1SG
-RpXSgx8bp7rdBJp3gpkeg/3nuamJ8PprsFrCQgBvH5+eS0l5/YzBbKRhmj9v0hmk
-IauIZFegC4OTrwyXarys0C1xOEqOsA1KXFGlRBHjqClWwQUAcv8ZF6d8z2jGOLZj
-l0TpKi1uWmQw1eVpEwsDweV2EbouVN9SG/K6218HQN3M5+o+gZoNxVVClCz/3y2B
-iTk3pXK7CRUG/r2jCByEPVpKCiYU25UcM93WmSMVWiRMRPWFSG3XB7ScJcBlNa6f
-Yr/uBX203/78WumPwapDU8YXktrzflayJlwkKqux/iVafpLVmy4Yh/kaCgsMNjEd
-4+3DIAvcDXWoljmXGe5Fjs+Q/fb9vGQL1dYCjkUg5pvJlrEg+JvCBnzOFE48AVSL
-IyXM5x7xvcM6/7qksmexj+Mb0esar1xGrWu/YqGcyAyTUDehZ9N9zGsPxdiy+St+
-TRzSbYhrTFju62vv0/NtCHh5ejSxTG4wu+5Wffs1fnWk08FNp7+XMKbeF9zyt+/I
-2IPGOrGcTo7MCTp4trcUKqMdb+OCLGpdk7qfNTzv3KgTnsP5b/aOw7JOlvq1SwvY
-XNHPq0/dDVOlwzxYXPXXv44L5hKtpgMubG92aw26xBHqN9qsD4pUeecEwo9FTr+Z
-0w/kskilqNSajY/1/gOx
-=0lfq
+iQEcBAEBCAAGBQJUJzFFAAoJEEdUh39IaPFNIQ4IAJfL6HT15dMH6LAOJPtzpywQ
+4f/W0MPyOJ2+y6jYYZqPDjS1VMlMvB6glaDJ38SjbAND1vgxTn5iLL/Yceajdsxu
+w2mAjp4PZGyAg6laNiADM2EifNBB7r8r0Kp8xwtBuBLd28nd+emrfxAWgIFbMFxR
+kuEokVQCPut6Pxq/UYsIAG5p3HWvdEomX37FrwbBsoifMHk+r/cRxaHfs8pHgWos
+P5ZtzNOCBlhux3btPvBpUo0hlyQ5quZ8pH5DQr2JFRE+6w4FBLupM5wW+FGPEwvs
+sYaQ9A1atz7MbrEoPO/E+A57/wUvIKSc1PIzTK6Is5QKwUAFDg35voxLwJ84zrI=
+=eyiY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmtp/libmtp-1.1.8.ebuild b/media-libs/libmtp/libmtp-1.1.8.ebuild
new file mode 100644
index 000000000000..250e784522e4
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.8.ebuild,v 1.1 2014/09/27 21:50:58 ssuominen Exp $
+
+EAPI=5
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+inherit eutils udev user
+
+DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
+HOMEPAGE="http://libmtp.sourceforge.net/"
+
+LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
+SLOT="0/9" # Based on SONAME of libmtp shared library
+IUSE="+crypt doc examples static-libs"
+
+RDEPEND="virtual/libusb:1
+	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	DOCS="AUTHORS README TODO"
+	enewgroup plugdev
+}
+
+src_unpack() {
+	[[ ${PV} == 9999* ]] && git-r3_src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
+	rm -f ChangeLog
+
+	if [[ ${PV} == 9999* ]]; then
+		local crpthf=config.rpath
+		local crpthd=/usr/share/gettext/${crpthf}
+		if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then
+			cp "${crpthd}" .
+		else
+			touch ${crpthf} # This is from upstream autogen.sh
+		fi
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable doc doxygen) \
+		$(use_enable crypt mtpz) \
+		--with-udev="$(get_udevdir)" \
+		--with-udev-group=plugdev \
+		--with-udev-mode=0660
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+
+	if use examples; then
+		docinto examples
+		dodoc examples/*.{c,h,sh}
+	fi
+}
diff --git a/media-libs/libmtp/libmtp-9999.ebuild b/media-libs/libmtp/libmtp-9999.ebuild
index 3a5189053819..ad0d54572e3f 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -1,43 +1,54 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.14 2014/09/10 22:17:02 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.15 2014/09/27 21:50:58 ssuominen Exp $
 
 EAPI=5
 
-inherit autotools eutils udev user toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/libmtp/code"
-	EGIT_PROJECT="libmtp"
-	inherit git-2
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
+	inherit autotools git-r3
 else
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
+inherit eutils udev user
+
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)"
 HOMEPAGE="http://libmtp.sourceforge.net/"
 
-LICENSE="LGPL-2.1"
-SLOT="0"
+LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
+SLOT="0/9" # Based on SONAME of libmtp shared library
 IUSE="+crypt doc examples static-libs"
 
 RDEPEND="virtual/libusb:1
-	crypt? ( dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error )"
+	crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-DOCS="AUTHORS ChangeLog README TODO"
-
 pkg_setup() {
+	DOCS="AUTHORS README TODO"
 	enewgroup plugdev
 }
 
+src_unpack() {
+	[[ ${PV} == 9999* ]] && git-r3_src_unpack
+	default_src_unpack
+}
+
 src_prepare() {
-	if [[ ${PV} == *9999* ]]; then
-		touch config.rpath # This is from upstream autogen.sh
+	# ChangeLog says "RETIRING THIS FILE ..pause..  GIT" (Last entry from start of 2011)
+	rm -f ChangeLog
+
+	if [[ ${PV} == 9999* ]]; then
+		local crpthf=config.rpath
+		local crpthd=/usr/share/gettext/${crpthf}
+		if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then
+			cp "${crpthd}" .
+		else
+			touch ${crpthf} # This is from upstream autogen.sh
+		fi
 		eautoreconf
 	fi
 }
@@ -54,12 +65,10 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	prune_libtool_files --all
 
 	if use examples; then
 		docinto examples
 		dodoc examples/*.{c,h,sh}
 	fi
-
-	sed -i -e '/^Unable to open/d' "${ED}/$(get_udevdir)"/rules.d/*-libmtp.rules || die #481666
 }