Add support for static-libs useflag and put la files accordingly.

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

3 files changed, 36 insertions, 23 deletions

diff --git a/sys-fs/ntfsprogs/ChangeLog b/sys-fs/ntfsprogs/ChangeLog
index 53107eaf7bb2..ae334df23d5a 100644
--- a/sys-fs/ntfsprogs/ChangeLog
+++ b/sys-fs/ntfsprogs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/ntfsprogs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.73 2011/03/30 14:41:43 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ChangeLog,v 1.74 2012/02/20 11:52:58 scarabeus Exp $
+
+  20 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> ntfsprogs-2.0.0-r3.ebuild:
+  Add support for static-libs useflag and put la files accordingly.
 
 *ntfsprogs-2.0.0-r3 (30 Mar 2011)
 
diff --git a/sys-fs/ntfsprogs/Manifest b/sys-fs/ntfsprogs/Manifest
index 62907015e648..7a7f970a4594 100644
--- a/sys-fs/ntfsprogs/Manifest
+++ b/sys-fs/ntfsprogs/Manifest
@@ -11,13 +11,23 @@ DIST ntfsprogs-1.13.1.tar.gz 870260 RMD160 4fea1dd03f7c4d2b7cfb05ca101aee902e1ed
 DIST ntfsprogs-2.0.0.tar.gz 903949 RMD160 8c1cae5091c4eb56a6e3fcd021ad172d39777f6c SHA1 c433189eb0955beb7360c6a475cc97083c5cd020 SHA256 143f7380d3627b92cea6f0929d22fc2c28b6bdd09a0e428cf638ae5c5b7c31f0
 EBUILD ntfsprogs-1.13.1-r1.ebuild 1521 RMD160 7948192110e8db652789e11749b7df2f82c08ab6 SHA1 ca25a31bf43aededf12f1a97f60bb69fd88571d0 SHA256 7e2d4d321d8f12aab3064a403ec19df7bda5ffcd7f80e00360760b4b5eec2510
 EBUILD ntfsprogs-2.0.0-r1.ebuild 1701 RMD160 220e0b068d79f7aabbb15a55a8fad831c7d62776 SHA1 2f81a5747c2502f28d604845c5dc5006a17123d5 SHA256 a3b1f0972d33b3c4b4f5f610c25c89a6b7ffad917fb06ad7b8b687c0cbea5c70
-EBUILD ntfsprogs-2.0.0-r3.ebuild 1804 RMD160 5d7a50344a5efdf7ff9809bec393b8fba7b05877 SHA1 f31bbcef3f18b51a69bbc6e6b1b9503ad9f40a84 SHA256 a36331874397f5b02fa817a8aa2efd5f932c6271bd3830c3b7928d7bbe265ac0
-MISC ChangeLog 11065 RMD160 a150ae8cf9109555416cb1728fe6612750b766c4 SHA1 49480032be1ccae0e2d85ada55449bc609fb8240 SHA256 0ffa6abe056ba2f821ea86efda1334699264182e126126774f2e0656f4c7a9f3
+EBUILD ntfsprogs-2.0.0-r3.ebuild 1773 RMD160 78098433ca0750d81f7667d2b21010d1aef61bd5 SHA1 4a7e6c3d3df84102b7f6a201fefd1e7b84b2073a SHA256 960479a70f96a4a0d4d8a0e8d4671fb775bcbd10f51121baf0cd70e3e53f28c0
+MISC ChangeLog 11216 RMD160 5d7209311e97abc15aed897c11f1d4f877d3c6cb SHA1 efda4163ff63e852fb5b6779686f84ff87f84c4e SHA256 ae18a384102849bf98900325b158f62809bbc6ecbeaaef152b48a72723576525
 MISC metadata.xml 223 RMD160 9f10fdaf4d9785ae7201c6e1f412b1e58e844d65 SHA1 8d3ae39172303e1fec9f1cc12d5d685f124eb42a SHA256 f1b190e5666562a1e3ac232a0fa507dc68bfad520521814c75db2fcecdef6861
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2TQSwACgkQAiZjviIA2Xg3eQCfbDnEwnXPxm8BQ4eN/YaD8kcT
-a1sAoII163pKFxxmZ0tS7LcXAmjQT66s
-=5E8w
+iQIcBAEBAgAGBQJPQjRIAAoJEOSiRoyO7jvoKFcP/0IpjzyAJbm7pUot9zpX0f6I
+IjTrorUWppcBxqSaLZ0aAcUmYEPwfkw7iSEv8kt+/h/SE2ZEgJ1UridA2WNB4a5n
+qnN/obYrLyaH78tz0lssuKEU+vySfTp+zvgIs/jCTkWMvnzWy99UniJrX3QRWp0+
+GzMY/8EgR7kqYfSqpvKi8e04os8bWchjLKhnMy20T7/FI9ykbR+oO4DCjB/eFTWG
+wz4ghvQqFq3whI0j/m7m3amtZ6SaRtEgDNeicRQzZ4hjGHAIocRf4bwDQxKbvWcu
+lJXnvvi4ZVQIxu8fMu/DtZAUu6qWDS92bTDGYlew5y2iysPaD2mbrKhBKmYTAiBq
+qCXU+lmg2CmzRduy2qDnshfVf2paJHxHwVHmiP8DaJrbVtVaAQCkwMJlJ3ACoQCA
+1sp4q+Wbiox6Sd6NkguiuV4d4SPBPFZiySbkrUgsEsiL2jJyoZaAWbdMzkLTcWZe
+jkx8vq/fvblfpT/cqRthQlmC7FVZWWg988I/tAam+8SwXH1Mtp9sGrq1G2BAKn2R
+8MIzXfcED0rmsOZFlUZuXdpV+vWefm7gpXnQ+ooBOyKgvHd6UdEukPHKuKeUfcnP
+G/pJAzlrtVOEIonTU0Y/x7JC91sTDY1NKIf5DfsowhG9KyrRurq3cP00k5l/LwqL
+HYL7JEIdd2VdiERtADzb
+=Z7CK
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r3.ebuild b/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r3.ebuild
index f5f50a3fdacc..7530b3153f41 100644
--- a/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r3.ebuild
+++ b/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r3.ebuild,v 1.1 2011/03/30 14:41:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfsprogs/ntfsprogs-2.0.0-r3.ebuild,v 1.2 2012/02/20 11:52:58 scarabeus Exp $
+
+EAPI=4
 
 inherit eutils flag-o-matic autotools
 
@@ -11,7 +13,7 @@ SRC_URI="mirror://sourceforge/linux-ntfs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt debug fuse gnome minimal"
+IUSE="crypt debug fuse gnome minimal static-libs"
 
 RDEPEND="
 	fuse? ( >=sys-fs/fuse-2.7.0 )
@@ -25,12 +27,9 @@ RDEPEND="
 		>=gnome-base/gnome-vfs-2.0
 	)"
 DEPEND="${RDEPEND}
-	!=sys-fs/ntfs3g-0.1_beta20070714
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	#epatch "${FILESDIR}"/${P}-extras.patch #218601
 	epatch "${FILESDIR}"/${P}-erange.patch #329445
 	epatch "${FILESDIR}"/${P}-cryptolink.patch #361307
@@ -40,28 +39,29 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# Avoid --enable-debug as that will set -O0 -ggdb3
 	use debug && append-flags -DDEBUG
 
 	econf \
+		$(use_enable static-libs static) \
 		$(use_enable crypt crypto) \
 		$(use_enable fuse ntfsmount) \
-		$(use_enable gnome gnome-vfs) \
-		|| die "Configure failed"
-
-	emake || die "Make failed"
+		$(use_enable gnome gnome-vfs)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	mv "${D}"/sbin/mkfs.ntfs "${D}"/usr/sbin/ || die
+	default
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+
+	mv "${ED}"/sbin/mkfs.ntfs "${ED}"/usr/sbin/ || die
 	if ! use minimal ; then
-		mv "${D}"/usr/bin/ntfsck "${D}"/sbin/ || die
+		mv "${ED}"/usr/bin/ntfsck "${ED}"/sbin/ || die
 		dosym ntfsck /sbin/fsck.ntfs
 	fi
 	if use fuse ; then
-		mv "${D}"/sbin/mount.{fuse.ntfs,ntfs-fuse} "${D}"/usr/bin/ || die
+		mv "${ED}"/sbin/mount.{fuse.ntfs,ntfs-fuse} "${ED}"/usr/bin/ || die
 	fi
 
 	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO.* \