USE static-libs.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

8 files changed, 30 insertions, 174 deletions

diff --git a/media-libs/libmtp/ChangeLog b/media-libs/libmtp/ChangeLog
index c386c9282744..612288cd46f5 100644
--- a/media-libs/libmtp/ChangeLog
+++ b/media-libs/libmtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libmtp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.70 2009/05/17 14:51:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/ChangeLog,v 1.71 2009/05/18 21:38:45 ssuominen Exp $
+
+  18 May 2009; Samuli Suominen <ssuominen@gentoo.org> libmtp-0.2.6.1.ebuild,
+  -libmtp-0.3.3.ebuild, -libmtp-0.3.4.ebuild, -libmtp-0.3.5.ebuild,
+  -libmtp-0.3.6.ebuild, libmtp-0.3.7.ebuild:
+  USE static-libs.
 
   17 May 2009; Raúl Porcel <armin76@gentoo.org> libmtp-0.3.7.ebuild:
   sparc stable wrt #267922
diff --git a/media-libs/libmtp/libmtp-0.2.6.1.ebuild b/media-libs/libmtp/libmtp-0.2.6.1.ebuild
index 84371fa456fa..868e1d5f5d87 100644
--- a/media-libs/libmtp/libmtp-0.2.6.1.ebuild
+++ b/media-libs/libmtp/libmtp-0.2.6.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.2.6.1.ebuild,v 1.8 2008/07/05 11:36:46 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.2.6.1.ebuild,v 1.9 2009/05/18 21:38:45 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
@@ -11,20 +12,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc examples"
+IUSE="doc"
 
-RDEPEND="dev-libs/libusb"
+# Please don't delete this ebuild before I know if pympd
+# work with 0.3.x versions, thanks, ssuominen.
+RDEPEND="virtual/libusb"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_configure() {
 	epatch "${FILESDIR}"/${P}-deprecated-keys.patch
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README TODO
 
 	insinto /etc/udev/rules.d
@@ -32,9 +33,4 @@ src_install() {
 
 	insinto /usr/share/hal/fdi/information/20thirdparty
 	newins libmtp.fdi 10-libmtp.fdi
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
 }
diff --git a/media-libs/libmtp/libmtp-0.3.3.ebuild b/media-libs/libmtp/libmtp-0.3.3.ebuild
deleted file mode 100644
index 572c4cce2acd..000000000000
--- a/media-libs/libmtp/libmtp-0.3.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.3.3.ebuild,v 1.2 2008/09/27 00:34:44 mr_bones_ Exp $
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
-HOMEPAGE="http://libmtp.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libusb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	econf --enable-shared --disable-static || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	rm -f $(find "${D}" -name '*.la')
-	dodoc AUTHORS ChangeLog README TODO
-
-	insinto /etc/udev/rules.d
-	newins libmtp.rules 65-mtp.rules
-
-	insinto /usr/share/hal/fdi/information/20thirdparty
-	newins libmtp.fdi 10-libmtp.fdi
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
diff --git a/media-libs/libmtp/libmtp-0.3.4.ebuild b/media-libs/libmtp/libmtp-0.3.4.ebuild
deleted file mode 100644
index c3bfffead32d..000000000000
--- a/media-libs/libmtp/libmtp-0.3.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.3.4.ebuild,v 1.1 2008/11/24 00:42:27 loki_val Exp $
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
-HOMEPAGE="http://libmtp.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libusb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	econf --enable-shared --disable-static || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	rm -f $(find "${D}" -name '*.la')
-	dodoc AUTHORS ChangeLog README TODO
-
-	insinto /etc/udev/rules.d
-	newins libmtp.rules 65-mtp.rules
-
-	insinto /usr/share/hal/fdi/information/20thirdparty
-	newins libmtp.fdi 10-libmtp.fdi
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
diff --git a/media-libs/libmtp/libmtp-0.3.5.ebuild b/media-libs/libmtp/libmtp-0.3.5.ebuild
deleted file mode 100644
index 0fc8785ba3dc..000000000000
--- a/media-libs/libmtp/libmtp-0.3.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.3.5.ebuild,v 1.1 2008/12/30 22:27:08 loki_val Exp $
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
-HOMEPAGE="http://libmtp.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libusb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	econf --enable-shared --disable-static || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	rm -f $(find "${D}" -name '*.la')
-	dodoc AUTHORS ChangeLog README TODO
-
-	insinto /etc/udev/rules.d
-	newins libmtp.rules 65-mtp.rules
-
-	insinto /usr/share/hal/fdi/information/20thirdparty
-	newins libmtp.fdi 10-libmtp.fdi
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
diff --git a/media-libs/libmtp/libmtp-0.3.6.ebuild b/media-libs/libmtp/libmtp-0.3.6.ebuild
deleted file mode 100644
index 620385ef603b..000000000000
--- a/media-libs/libmtp/libmtp-0.3.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.3.6.ebuild,v 1.5 2009/03/18 06:34:45 josejx Exp $
-
-DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
-HOMEPAGE="http://libmtp.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
-IUSE="doc examples"
-
-RDEPEND="dev-libs/libusb"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_compile() {
-	econf --enable-shared --disable-static
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	rm -f $(find "${D}" -name '*.la')
-	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
-
-	insinto /etc/udev/rules.d
-	newins libmtp.rules 65-mtp.rules
-
-	insinto /usr/share/hal/fdi/information/20thirdparty
-	newins libmtp.fdi 10-libmtp.fdi
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,sh}
-	fi
-}
diff --git a/media-libs/libmtp/libmtp-0.3.7.ebuild b/media-libs/libmtp/libmtp-0.3.7.ebuild
index b0fd0fb91764..119802494da4 100644
--- a/media-libs/libmtp/libmtp-0.3.7.ebuild
+++ b/media-libs/libmtp/libmtp-0.3.7.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.3.7.ebuild,v 1.6 2009/05/17 14:51:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmtp/libmtp-0.3.7.ebuild,v 1.7 2009/05/18 21:38:45 ssuominen Exp $
 
+EAPI=2
 DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)."
 HOMEPAGE="http://libmtp.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -9,19 +10,22 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc examples"
+IUSE="doc examples static-libs"
 
-RDEPEND="dev-libs/libusb"
+RDEPEND="virtual/libusb"
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	sys-apps/findutils"
 
-src_compile() {
-	econf --enable-shared --disable-static
-	emake || die "emake failed"
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
+
 	rm -f $(find "${D}" -name '*.la')
 	dodoc AUTHORS ChangeLog README TODO || die "dodoc failed"
 
diff --git a/media-libs/libmtp/metadata.xml b/media-libs/libmtp/metadata.xml
index 37ba3e4f2765..9fd2d07c632d 100644
--- a/media-libs/libmtp/metadata.xml
+++ b/media-libs/libmtp/metadata.xml
@@ -6,4 +6,7 @@
 		<email>ken69267@gentoo.org</email>
 		<name>Kenneth Prugh</name>
 	</maintainer>
+	<use>
+	<flag name='static-libs'>Compile static archives</flag>
+	</use>
 </pkgmetadata>