Version bump.

(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)

3 files changed, 79 insertions, 7 deletions

diff --git a/media-libs/libmtp/ChangeLog b/media-libs/libmtp/ChangeLog
index fbf5cb638da9..30d8f07fc96e 100644
--- a/media-libs/libmtp/ChangeLog
+++ b/media-libs/libmtp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libmtp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.110 2012/08/06 13:20:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.111 2012/08/23 10:56:22 ssuominen Exp $
+
+*libmtp-1.1.4 (23 Aug 2012)
+
+  23 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +libmtp-1.1.4.ebuild,
+  libmtp-9999.ebuild:
+  Version bump.
 
   06 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> libmtp-1.1.3.ebuild,
   libmtp-9999.ebuild:
diff --git a/media-libs/libmtp/libmtp-1.1.4.ebuild b/media-libs/libmtp/libmtp-1.1.4.ebuild
new file mode 100644
index 000000000000..d01f17984306
--- /dev/null
+++ b/media-libs/libmtp/libmtp-1.1.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-1.1.4.ebuild,v 1.1 2012/08/23 10:56:22 ssuominen Exp $
+
+EAPI=4
+
+inherit autotools eutils user toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
+	inherit git-2
+else
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
+HOMEPAGE="http://libmtp.sourceforge.net/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+crypt doc examples static-libs"
+
+RDEPEND="virtual/libusb:1
+	crypt? ( dev-libs/libgcrypt )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+DOCS="AUTHORS ChangeLog README TODO"
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		touch config.rpath # This is from upstream autogen.sh
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable doc doxygen) \
+		$(use_enable crypt mtpz) \
+		--with-udev="${udevdir}" \
+		--with-udev-group=plugdev \
+		--with-udev-mode=0660
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	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 d5515f32e7fa..45a3cd02b413 100644
--- a/media-libs/libmtp/libmtp-9999.ebuild
+++ b/media-libs/libmtp/libmtp-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 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.4 2012/08/06 13:20:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-9999.ebuild,v 1.5 2012/08/23 10:56:22 ssuominen Exp $
 
 EAPI=4
 
-inherit autotools user toolchain-funcs
+inherit autotools eutils user toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
@@ -21,8 +21,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="+crypt doc examples static-libs"
 
-RDEPEND="sys-fs/udev
-	virtual/libusb:1
+RDEPEND="virtual/libusb:1
 	crypt? ( dev-libs/libgcrypt )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -42,18 +41,21 @@ src_prepare() {
 }
 
 src_configure() {
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable doc doxygen) \
 		$(use_enable crypt mtpz) \
-		--with-udev="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" \
+		--with-udev="${udevdir}" \
 		--with-udev-group=plugdev \
 		--with-udev-mode=0660
 }
 
 src_install() {
 	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files
 
 	if use examples; then
 		docinto examples