version bump, bug #548528

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

4 files changed, 96 insertions, 26 deletions

diff --git a/media-libs/libmtp/ChangeLog b/media-libs/libmtp/ChangeLog
index edea7b153b4b..e506c63d831f 100644
--- a/media-libs/libmtp/ChangeLog
+++ b/media-libs/libmtp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmtp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.156 2015/05/06 07:08:48 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.157 2015/05/06 07:23:14 yngwin Exp $
+
+*libmtp-1.1.9 (06 May 2015)
+
+  06 May 2015; Ben de Groot <yngwin@gentoo.org> +libmtp-1.1.9.ebuild,
+  libmtp-9999.ebuild:
+  version bump, bug #548528
 
   06 May 2015; Ben de Groot <yngwin@gentoo.org> libmtp-1.1.8.ebuild:
   Mark stable on amd64
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index ef368c9c8838..b1e11e868989 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -4,27 +4,29 @@ 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
+DIST libmtp-1.1.9.tar.gz 760593 SHA256 23f1d3c0b54107388bf2824d56415e9e087c980c86e5d179865652c022b6b189 SHA512 6be9f14602b05830ec01defaeb0f237ac4d021f76f4003d7178eda00d8bf86d7fbbeba0053dc111d2ab9eb32f1603c2dc4f2bc128f4cbe4819228486b9b85513 WHIRLPOOL d357c949907b69f3a40291a79e05cc75790d86abb7fa0ea787c5ef0cd666b7f9888f9441f9893824520345d25799142f70c0ba0b773267fb9b374bb0d8b833e6
 EBUILD libmtp-1.1.6-r1.ebuild 1539 SHA256 68812f52a4a4c345e9467f043aa111230e98a82c402d9e08f9b80f0e1478e364 SHA512 07eabcb2b656713a6ff4cf145802484923b27c9bce2595869aca670aa209905ceaa89da6e5b49a3ce687ad217aac3669fb062a5b1f5c78f70b813143ffbd92cb WHIRLPOOL b90145024396872bb89e92e1b424bf7d0ac285c88e451f58b96b3a621f22d076a7c80297fdcb30eae2942616ace3082a90796ec9aac10326b46f3f7a0a5d9e9a
 EBUILD libmtp-1.1.8.ebuild 1775 SHA256 d76bf242903faf99aa1aa458efd71bdfe717d2a29cd397d70e2e86ba048fc232 SHA512 b63279e91d602b204fc33aaedf41170502f738fb9a448611fd92f8c95b51c8c8f32457b897c4edec130a24fde845ac537cbc154d1abe1b33cf4f1ba87a723441 WHIRLPOOL 5ea087e8b0d232e4d42a92f9005cff0780047db138cd7f6f83ae61b7bb433cb799d60c5636ff693fc3ed0521d827e350d341758e6977c0cdddd5ce37bb4d18bb
-EBUILD libmtp-9999.ebuild 1783 SHA256 6a9c5fd9506c0d349d355f016ec2d81b777243ba40a95658a4bbb869fc756ae5 SHA512 ac3b6fba90c195621164d0a68f2bbd9e89ba0feb8d094a28524bd69535e8ee9c11fb8373fcee54efe667c2dedae721865c678638443cda102c1e66be60f8fd43 WHIRLPOOL 79b9e60d566de206a7b4275410e27629015a6d4e032f8179627234105a0874bcbec464b35262eee0a4f0ed21cdcd4045bc254be066b5fa4b4a4974397032dce3
-MISC ChangeLog 19515 SHA256 c915de0be8af05e27e96cdf6ebf0e2e7b99a92eda398d81db1807c30889e74b4 SHA512 71a15a44bc681b15bef593812d030ed7f26becc02b33ebd1dd39370b1818c351d2c0fcbcc92341ed3e61854d651604071a2b0aec98cdccfd9c5f4b0c8d2c08c6 WHIRLPOOL cbad44be11828053cf2b07b866a26bbd2fe4be2898da278a452f452749c35efcf6796290907ed03713013dc384b35ce2cff4c0119051becba9267fe94a326db2
+EBUILD libmtp-1.1.9.ebuild 1698 SHA256 3d32ead07c77fa6a874764581e067d2f0affea3380d758d690288d1eb061daac SHA512 c3676af2008bffe42a51fffcddff9972518c79e3ec915f0ffd6741b9cedea25ca4e8b1ce04f947c6e54b66c768af1d9315fff83e365a3450bbb228c717f590fb WHIRLPOOL 4a037148913aecdb26fb787edf63156664060e8b6476976155818f308f5fdac4cddc71d85cdb14ab6277d88e7677a19540ecc3a42611c248380a9b07b8128fd1
+EBUILD libmtp-9999.ebuild 1698 SHA256 40ff7aca1e5e0de1888af9ae7a3a625c79fa125f05d87135483f49ed0f3bf3e1 SHA512 ecec66b57f4d01255516ce242a89eac92efa31cb96b904bef355a0acabbfde8fb79a09ea7c722aed16bfdf23c1c10ff937c7e84bed9f01adc9df2c720f675a0b WHIRLPOOL ac557aab5e69b54c970d977ca6e9e4539961595301f5cd4edd05c119c111f5a8d4c965893c6985d7648b51179a62e52b5c6f62241e4cbe0476bb77217050e11d
+MISC ChangeLog 19665 SHA256 84f11c9125865b4d08324ebfe7bf46cb8f12ea29ad8f9fedfac128d6b912471f SHA512 98746da0dccb36726c3734c6943c48f3edf020d7cce500c3b2a05ae9fb0f941e27f375c2d1c7b74ed2a89d191deb8608a32e1f67ff5b919f8ce2b04107df8e81 WHIRLPOOL bf454d7e40be4c4f782dc6f3444f0ba92f7c5cf94174870989943af30878a872ae5f06a29542e395c08872de484c3edfcbc47b04bae68e907716258e9705cfb7
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVSb4CXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVScFlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
-RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOjM4P/i74c2Bq8WJ+mUhWK1CN5ojp
-VkbaVyiQps+GjbNXy+rf/KxX0nVv5ZLt5LcaqhaAlNVLOqjfyWBs1Tv8d2xN+9m3
-lEV3bw3sawJ5GKrfF0dzeqsXf2fEzlRkOXKtuO4vhfmSwFxTLEsPXyCidOFcJjQd
-CjJFjxTlR+ks6erl4npTB/1o4gW0Wy0FJVc9eYJ9avDlea0g6ccEfAKczAdk+LSA
-2ECUKOdmFllBU1Y05WDPDjVdBkkXO8cFn7yMAKizKqEQk1VharN/o4+AuiKdMYts
-UUVU6u7kL4IYE2QrH3YPS6MqF5i33GUbx74ESM9Hq+/gkOaxklVhxPluXa4nRJdf
-sE8n9OusVxf1YMPdK4nf28GS/Qo74UnsYj7odRuRdE/8lRaDO66wRh3VpvUxyQdv
-85FQBpEbWsCzSARLHWfjkDkgUbdEZEm9T9nLfdYmwaplaraTnlNhdglMlNiESz/H
-eEEfVhrQsmbunWXu5NogBTh62I5eyBLoXngQvGFXtQ86zLGXous1RrEhpnYioxIC
-KPk2tAKsCCNmfW1YRdvJI/cHU6ePE5U+4wS2hXo4w8QDxjGcLhqquRYd9Nj4jVSs
-NzUGjcgICT3Voo8eOuBQMCZCotATFPRMIXbyZ3K36cTKbV/Om6LzXwoFFc97ywA+
-iwgur8B89sydb2TyJBHY
-=5y8e
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO62QQALf+5yRqRMOqme0sJVmkBP/0
+v2td1zXsbg2DZLCh7s8GH9NNQx/ZuSOWr4toyB4opT8BRCRYAQ3nJ0HripfsCiWW
+92USZd3DlaYU6Xc/DOyhzvD5FhECZCZVZsHr/XyKkhTiNMfFkf49haaNoMIVFPQm
+8Qjq3bDjCbzHqdl6iRCJI1GXUlvecZJbzzaAhzeIYBo3O7FSFHTRKZQ5EwQ9QJic
+oslUN9sGHYb3BdszcBNmbQlNs7VY3Dri5oPwxOkBB+BgHPtY102Qf3seeq173ZLQ
+aB1j/Yn+LA1K6sMkJqH9TGu62CHNVm4GSiHikla8A2b8nwUU7G61T/Gcw8lOW64N
+VTwlEcP+KmmxR0xquCYOmq3NjfURrOgoCgceeMBd9TXoW6jgWevfHVTUjlyP0XSp
++6lc6CZ9CiFPH85rZcutY1frO9w5mrrVMfQTmvjDzYXePqeA5bibXmuP6+JCm3PL
+VizikfKmosUNxLIINhJI4iUoR3DW4sNrazYA7P5ZOq/CX465pajY0j7n4S/PZ023
+j0hPY4+wIR6+SulIG+1qQLcrceO5ZtIa2XnQrbF+732nJeJxURvxiH+3QzfKcmwR
+LDx90AFPH0Z5RMN+/+ARXrFcRwFAtREX3YxVbyS+pZJrMpKX+qh+g2P7qdrposWc
+S0qBUjwOBkBHACzyYb3u
+=nkUH
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmtp/libmtp-1.1.9.ebuild b/media-libs/libmtp/libmtp-1.1.9.ebuild
new file mode 100644
index 000000000000..5216cb505abf
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.9.ebuild,v 1.1 2015/05/06 07:23:14 yngwin Exp $
+
+EAPI=5
+inherit eutils udev user
+
+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
+
+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_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 ad0d54572e3f..5eb0c5f20f0b 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.15 2014/09/27 21:50:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.16 2015/05/06 07:23:14 yngwin Exp $
 
 EAPI=5
+inherit eutils udev user
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
@@ -12,8 +13,6 @@ else
 	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/"
 
@@ -32,11 +31,6 @@ pkg_setup() {
 	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