Migrate to various "new" styles, EAPI5, udev.eclass, new enough util-linux, and more

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

3 files changed, 30 insertions, 38 deletions

diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog
index 23ee6af3756a..ec63dc26162f 100644
--- a/sys-fs/ntfs3g/ChangeLog
+++ b/sys-fs/ntfs3g/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/ntfs3g
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.139 2012/11/03 19:15:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.140 2012/12/03 08:45:52 ssuominen Exp $
+
+  03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org>
+  ntfs3g-2012.1.15-r2.ebuild:
+  Remove USE="extras" to always build the `ntfsck` command with USE="ntfsprogs"
+  by Robin H. Johnson. Force at least sys-apps/util-linux >= 2.22.1 for working
+  mount wrappers wrt #437230 by "Pun".
 
   03 Nov 2012; Anthony G. Basile <blueness@gentoo.org>
   ntfs3g-2012.1.15-r2.ebuild:
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 9342b1b01580..f7f5857dc4cb 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -4,23 +4,17 @@ Hash: SHA256
 AUX 99-ntfs3g.rules 51 SHA256 912165f71bbcae4753cd10a74c78bfd98e49bd9adbf80b96c39fc6738b12d463 SHA512 9310dd1dceec9a6252d3e8b95a9a1002c84a6f077457892eefe1255c85557041defbd8dcf6acef86285b45abd8bbe85822dd59a9e4c307bba80dd2c17f971851 WHIRLPOOL 9a0439ceb3bb1f142ee1929c03dab22066fdb3dba85c216265f6f10f3e9e2416beb4f3a73c8965b621b8d7b34c467a81628b6656f59e4c51e9fd529007f7ca27
 DIST ntfs-3g_ntfsprogs-2012.1.15.tgz 1149907 SHA256 6f1611c5000de7ca99141a9b853cba2c8dbd86c8e36d5efbe7ba918af773fb25 SHA512 90dd894257f2ba683f1c6203e975288133bed2baae3d1c09087d5a1c93a1299cb0fd2099310c4d31e35463625a81ce49f9a69af3b9cd7223790d1cdd37e7a65e WHIRLPOOL 8f17ea20a55f10d01b005ed222f6fb21f2eb01a834363690d4823874390d539eb55a97957cc5fdc4611a50421d2bd03c8a6cdbc295700a083b00d28a077388f1
 EBUILD ntfs3g-2012.1.15-r1.ebuild 2012 SHA256 cdaa978aa8987e73f6bd65cd2cee3532d34921ae266df984260702d6b4c2a1da SHA512 6fab5666554f860bc16314d8ab8683e1d4225934607d3a3703b9630b067c3d7b7717efbe3184114c99adab25339b3eb41154e0692dd168de0c3fe620dfd6cf1e WHIRLPOOL 7fba5e0b9efcfd7a4cb1f9e013e126dbdbbaf4945717924ded17f6013ea932b52e3fbd9b1cc53c013f6ac1e8159cb0a62348a0f21dfc61848d1535200fc68fa7
-EBUILD ntfs3g-2012.1.15-r2.ebuild 2137 SHA256 1a64fa9f6a7da666ad990329ca0daf01164fc60313293f7249e04585a11936e9 SHA512 e8f239f508c5452391d5209cae86b55db27884f912bae4876dc880e526f0f52fd15f7008d61a0b10e238d72a361fe2e08b45c4053ee5a9ff95ac4aa9fdec4767 WHIRLPOOL 9d83e395e5d1baf0417bd247c944f3c6e6c70d975ea14aba970906d898d98441e2be19134441c99f88a2f57027b4cf7597c9903e8e56943257dfd36bdf5c314e
-MISC ChangeLog 22186 SHA256 092c37d79387d60b85bd1c74572b56efc62d0e12f6862d9bef9329522707757c SHA512 86792f93df5c511b388f7e858f9ca81afa30dd1a4663f695e6ff8d6add839cbfcfc0b2da09e060ba53d5e7858f0b40fb2b10346e76a8106c6c86bfaff3dad76a WHIRLPOOL 2531da8fce8cf3d8ee5db0ffacdba2847877e6db50d85060af98d5ded2f32752f2bf2829181b9618ef596c9718d079951f7040ad31f5d70ef00d086ca997c9a9
+EBUILD ntfs3g-2012.1.15-r2.ebuild 1927 SHA256 f2d7736a5e8c8b3cbda5da0849a8f9d9f5745052e9bb7cdd89aae75f54f212d6 SHA512 efe330b0c9d6f1aa2ed1096b080c885bce8fe91cf7d8791ff0b296806f7c6c4c9cd3ade195a939202454eff1c504f0f6f890529bb2f595e32d148191497e3d07 WHIRLPOOL 6c928809d4439c988bc809738901e77d1eac4aa3623efd7e76607ab9970b069531375b1ca0af073a53cb850f8536882bd7712b675eb9b3064f0bac5a178c073f
+MISC ChangeLog 22471 SHA256 58b7d32d91e878370efe6bef7b6ae78ca7683909583b883db590654add98210d SHA512 8873c7bcbd04419db7788dfcd59b175615e0bd1ac3185911f3b874c0779255f622ba458a28278d191bb88da27e4d67c3ca059971a9bc2a2990b8e33f4b8290a7 WHIRLPOOL 8769d8e5b4a8979f699b9e33427baf3a9a6fb246a33d77efaf149f99bfd2e58fe64650688bfc0d20f3bbbfd18c0535484a3531ad2d47cca34b7822e75ecba661
 MISC metadata.xml 1247 SHA256 f433c0afc78c8d5d540786543ac7297ee41d48a21c8a768767edeafb3ca16a88 SHA512 6c6f72c73fec0f42e24d0bccf658e2e8804bafea3504de293f2826bb8f44b63605f4844e44e0282197a8e489c73e3760399454d86ce7473ce4eb971f29d55211 WHIRLPOOL db19a1014f96344f6cf6ded41191b0b44a5ff91059da9cf66903ffc737c967abb5dd605de2d95c7d6688eb33916e2bbd2a939227f61f92815ce9f1041cd77c62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQlW1iAAoJEJOE+m71LUu6QpMP/iszCsQ9UBuNJf6MgvmODOM2
-TZtWOVZMGPm+RN3T/SK6WmMu3IuFb1rhnj2qskIXwjDndQ2soS3ngpE0b9xTs/f6
-SdT2s+85Z0SIjfaDFc33APqk3IBlPgwILhSCuponvOSZJCcl/Grbqt/OR0uCO40o
-tGaVQjByslNloa3q2Ed5JLpEXtpse2v5ijk9zdpjdGWbpaYHz5UyO1h+nO5KOicn
-1pXsou59ZEkc/ydRFlcP/LygEbiQAF7nE4Ld3xZnzcNh5PSoX90swrmpeN9FE/7V
-Os407nyj5Yp2hiToNvIT5aJ2dc2M0KyWiwWZq8X3kOCjyNmnJL3YN13+joKgdCVU
-c/8o9GUH/qaOpdGQQDSOL7ayKpxTIqWZzqPCiD+om7nUW0ht8QvVgwIiFAYzSUMt
-GO7C39NVL9pfu9pQ8ny+eVuiawaR6OLXktMK5TBjgLfkWzL4xREKTQSMapTWRDqk
-4lQFoYMOQdsH2MLXWKghIClspxvWcpn9/qXnBciF7vGkk9KJVbuhtM1Uz9zdOo62
-TAGO3D/E3oF1WjozRr7UkzaecIWhpAkosmTAvinI9CKRpV/5hjrMq7iKLAadCdTs
-CPHqBNdvNfgC8Wt6DFnyYqJs00frECGoLGp/wJezxI2bd17ybu8BmqgvG5cdi9+B
-HCUWPUtEAVEFxIJGqdq6
-=2LAt
+iQEcBAEBCAAGBQJQvGbBAAoJEEdUh39IaPFNQNcH/i08o28eP3Llh/2ATCObFEGQ
+InE011A7ryvfXmEOEhxi7V2MouZCL6f1UklTK8rr6slGUTPuUW72nVUIYdmw18HM
+uXM5ASd35XQKRp4M3g31DM2ZRFfk/fODHwnn9w2F+RWxO0xgXopJmHg+U4pY5hdM
+7clzuTwGuSd5zE5JnBqLPBgXjDGV+yRUR0ZUws+C2u2fU05YGDpPVFREMjCbK4Ye
+79hxPuf3x1hNEoZxyQ5igtzc46gMRUbl5fP70hhW0wvaqohTh8jpfKhK30yyi6nj
+UUHIXUBnh6SVzUs0AgwCpAx8N/5/MJco5bXNZnUy2OI6lyDmz6Ij6o3TZr8HE7s=
+=3l2r
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ntfs3g/ntfs3g-2012.1.15-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2012.1.15-r2.ebuild
index 6c18fb773234..bb0edcee7856 100644
--- a/sys-fs/ntfs3g/ntfs3g-2012.1.15-r2.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2012.1.15-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2012.1.15-r2.ebuild,v 1.4 2012/11/03 19:15:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-2012.1.15-r2.ebuild,v 1.5 2012/12/03 08:45:52 ssuominen Exp $
 
-EAPI=4
-inherit linux-info toolchain-funcs
+EAPI=5
+inherit eutils linux-info udev
 
 MY_PN=${PN/3g/-3g}
 MY_P=${MY_PN}_ntfsprogs-${PV}
@@ -15,9 +15,9 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl crypt debug +external-fuse extras +ntfsprogs static-libs suid xattr"
+IUSE="acl crypt debug +external-fuse +ntfsprogs static-libs suid xattr"
 
-RDEPEND="!<sys-apps/util-linux-2.19
+RDEPEND="!<sys-apps/util-linux-2.22.1
 	!sys-fs/ntfsprogs
 	crypt? (
 		>=dev-libs/libgcrypt-1.2.2
@@ -25,8 +25,8 @@ RDEPEND="!<sys-apps/util-linux-2.19
 		)
 	external-fuse? ( >=sys-fs/fuse-2.8.0 )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-apps/attr"
+	sys-apps/attr
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
@@ -45,8 +45,8 @@ pkg_setup() {
 
 src_configure() {
 	econf \
-		--exec-prefix="${EPREFIX}/usr" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--exec-prefix="${EPREFIX}"/usr \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable debug) \
 		--enable-ldscript \
 		--disable-ldconfig \
@@ -54,30 +54,22 @@ src_configure() {
 		$(use_enable xattr xattr-mappings) \
 		$(use_enable crypt crypto) \
 		$(use_enable ntfsprogs) \
-		$(use_enable extras) \
+		--enable-extras \
 		$(use_enable static-libs static) \
-		--with-fuse=$(use external-fuse && echo external || echo internal)
+		--with-fuse=$(usex external-fuse external internal)
 }
 
 src_install() {
 	default
 
 	use suid && fperms u+s /usr/bin/${MY_PN}
-
-	local udevdir=/lib/udev
-	if has_version sys-fs/udev; then
-		udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-		udevdir=${udevdir#${EPREFIX}}
-	fi
-	insinto "${udevdir}"/rules.d
-	doins "${FILESDIR}"/99-ntfs3g.rules
-
+	udev_dorules "${FILESDIR}"/99-ntfs3g.rules
 	prune_libtool_files
 
 	# http://bugs.gentoo.org/398069
 	dodir /usr/sbin
-	mv -vf "${D}"/sbin/* "${ED}"/usr/sbin || die
-	rm -rf "${D}"/sbin
+	mv "${ED}"/sbin/* "${ED}"/usr/sbin || die
+	rm -r "${ED}"/sbin
 
 	dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197
 }