sys-fs/ntfs3g-ar: replace rm -rf on sbin with rmdir, add missing 'die' statement, drop old version. Thanks to Thomas Sachau for pointing on these issues

Package-Manager: portage-2.2.0_alpha149

4 files changed, 10 insertions, 90 deletions

diff --git a/sys-fs/ntfs3g-ar/ChangeLog b/sys-fs/ntfs3g-ar/ChangeLog
index 359b662b1..eaf2d32f4 100644
--- a/sys-fs/ntfs3g-ar/ChangeLog
+++ b/sys-fs/ntfs3g-ar/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sys-fs/ntfs3g-ar
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jan 2013; Sergey Popov <pinkbyte@gentoo.org>
+  -ntfs3g-ar-2011.4.12.7.ebuild, ntfs3g-ar-2012.1.15.8.ebuild:
+  QA: replace rm -rf on sbin with rmdir, add missing 'die' statement, drop old
+  version. Thanks to Thomas Sachau for pointing on these issues
+
 *ntfs3g-ar-2012.1.15.8 (19 Dec 2012)
 
   19 Dec 2012; Sergey Popov <pinkbyte@gentoo.org>
diff --git a/sys-fs/ntfs3g-ar/Manifest b/sys-fs/ntfs3g-ar/Manifest
index 5e3d42979..866a799b4 100644
--- a/sys-fs/ntfs3g-ar/Manifest
+++ b/sys-fs/ntfs3g-ar/Manifest
@@ -1,7 +1,5 @@
 AUX 99-ntfs3g.rules 51 SHA256 912165f71bbcae4753cd10a74c78bfd98e49bd9adbf80b96c39fc6738b12d463 SHA512 9310dd1dceec9a6252d3e8b95a9a1002c84a6f077457892eefe1255c85557041defbd8dcf6acef86285b45abd8bbe85822dd59a9e4c307bba80dd2c17f971851 WHIRLPOOL 9a0439ceb3bb1f142ee1929c03dab22066fdb3dba85c216265f6f10f3e9e2416beb4f3a73c8965b621b8d7b34c467a81628b6656f59e4c51e9fd529007f7ca27
-DIST ntfs-3g_ntfsprogs-2011.4.12AR.7.tgz 1144332 SHA256 62161e32052f47964ebf1209fc01774b13e32412ae07a9b6e01e073b8c4c54c8
 DIST ntfs-3g_ntfsprogs-2012.1.15AR.8.tgz 1178240 SHA256 932534e2f0e6e2c8f8702d882c465507f6fd0a987709dc8577a3471568fe8c5b SHA512 867970ae2fd7f990d6f453693dbf90b104eadd1f44ef156bd51cbebd1861da05456e008a7089ac1be576c50464dc69dbf16b5e8c1d5b34e14d96c2d0e49ae9d8 WHIRLPOOL aff847ff3c55392f0ea9a94aa24b46db3ece42d2784a3ee04b0b50380db91ad8eac955bee15ba04156480a79be052ba3c764932bb46be2486b0493397578978e
-EBUILD ntfs3g-ar-2011.4.12.7.ebuild 2365 SHA256 1931e7984c13cc220c28eab91e5a14f04149d91416b465c55c49264d718d62ad SHA512 f524a4f8f96ab42f12677b6a9d1c09c569d94ac5401a1a42d38f05b51d22e101d65dc99f6766215bfc483e59e8faa17ec267a130f9e98b2f80663ca866e9db03 WHIRLPOOL 158ad55fc91daa17cfbf1956308cd7b4db460fba6dc8565d97dec6a17cde9a5005982a647cbdac259c1c4363faf6480f6701b7f8b73544c48af66e30d2d7a071
-EBUILD ntfs3g-ar-2012.1.15.8.ebuild 2264 SHA256 bad22796856efb75d51fa089862388722cb586d7fe404463bf8131e77c81a69b SHA512 ffcd6a113754c6aedc0f8445dea8d4ceb02ec407711fcefac508fca7282d5a822e8c0ae5730bb27fa3cc10129065aadb08d2c3842b64f8590b92c9058f530d9f WHIRLPOOL d85d43dadfcbb6b33e58776c83471f541e0e1942e222d4fb8472f0fa33d39f2372c7c4f16f4e1f7e539d53b395c729dbda346c2be9e8bf11731a2121d486d9fa
-MISC ChangeLog 2801 SHA256 0fc951d504998595cb8b85ca98a0d2f59943289b38fa744f072f033166710698 SHA512 8c1c766c717413f3a470bdb7babb08b733cafc06cd707bfbcb8aaf459518b811b66c43c116548979afcd73707e1a5aa332da787b1f9109797090818ca76518fc WHIRLPOOL 1ad98cf8dfa54df2d801a23988c21d5b3513431d718c4ceb1f6b9b61d1e9c3ee1df13738bc19916ec1b98e582b7cf91f3e89d3d4d02095de4621c5ec195370f1
+EBUILD ntfs3g-ar-2012.1.15.8.ebuild 2285 SHA256 8b0d8961937e48bb4f90a661da60ed031ca5cb854b89311d8e7a52358f818e2e SHA512 5af3a2f971124651b8125175c2e54a3d5d2aa7f7bb7b6cb3e782a6dcf7794a0d8a41acf6c9fd1cea69e337444a3cb1423fa8b62345ab8cc68110a91091d17e11 WHIRLPOOL 3e06b21ff36e917cfc1691759855a8f28df51dbd31b488e6d37535f00a004b1640fe8752dd5894a10e78ded11ff021c8bf3de315a89e0e9441aca485a9efcf57
+MISC ChangeLog 3058 SHA256 51af701f1e1d643c1aba34b63e5e75ee87e08ac65d7a5ecd96ce7b20e4d1c230 SHA512 45ac4e719429533b12ebbfac0bc47a45dc200774db2fbaddb3501e2dd184888d0f8adb83ddc700653ca1e1e424f6ebe98888758bebc7b073cef3f048e8c3232e WHIRLPOOL 4cede654b1e5c4746457f74e51506f27e6d84d570222a566662efe68ae1a3d8a10f2c4340fd9d9cd315fa34d0c46d1baaa88bb1fa08624ea0896a15cbf851c9e
 MISC metadata.xml 727 SHA256 462bddf4a2463fff1905df03150536b6e2bf2a07b44eac61c8a47b649ff6d65e SHA512 4b19b188bc7d5ca9af95a613e3d2cf9a6acb306a645ded81919f49763e7145c871ee0c0cbdaf1aed727b315800adc9c86853ce88655b94035f73b19d79e51946 WHIRLPOOL e28c1671a4f02c5d569b235dd111f9a97fb4d26c6e28f5f4c32c87c84399e97bde94fe0fcab7cacce2414b6a2e65bdbaff4f5f2e49d9487db3c3310a20ffccee
diff --git a/sys-fs/ntfs3g-ar/ntfs3g-ar-2011.4.12.7.ebuild b/sys-fs/ntfs3g-ar/ntfs3g-ar-2011.4.12.7.ebuild
deleted file mode 100644
index c0737096c..000000000
--- a/sys-fs/ntfs3g-ar/ntfs3g-ar-2011.4.12.7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit linux-info versionator
-
-MY_PN="${PN/3g-ar/-3g}"
-MY_PV="$(get_version_component_range 1-3)AR.$(get_version_component_range 4)"
-MY_P="${MY_PN}_ntfsprogs-${MY_PV}"
-
-DESCRIPTION="NTFS-3G variant supporting ACLs, junction points, compression and more"
-HOMEPAGE="http://pagesperso-orange.fr/b.andre/advanced-ntfs-3g.html"
-SRC_URI="http://pagesperso-orange.fr/b.andre/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl crypt debug +external-fuse ntfsprogs  static-libs suid xattr udev"
-
-RDEPEND="external-fuse? ( >=sys-fs/fuse-2.8.0 )
-	ntfsprogs? ( !!sys-fs/ntfsprogs )
-	crypt? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-apps/attr"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use external-fuse && use kernel_linux; then
-		if kernel_is lt 2 6 9; then
-			die "Your kernel is too old."
-		fi
-		CONFIG_CHECK="~FUSE_FS"
-		FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g"
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-ldscript \
-		--disable-ldconfig \
-		--with-fuse=$(use external-fuse && echo external || echo internal) \
-		$(use_enable ntfsprogs) \
-		$(use_enable crypt crypto) \
-		$(use_enable acl posix-acls) \
-		$(use_enable xattr xattr-mappings)	\
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dodoc AUTHORS ChangeLog CREDITS README || die "doc failed"
-
-	use suid && { fperms u+s "/bin/${MY_PN}" || die "set suid failed" ; }
-
-	if use udev; then
-		insinto /etc/udev/rules.d/
-		doins "${FILESDIR}/99-ntfs3g.rules" || die "udev rules install failed"
-	fi
-
-	find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	ewarn "This is an advanced features release of the ntfs-3g package. It"
-	ewarn "passes standard tests on i386 and x86_64 CPUs but users should"
-	ewarn "still backup their data.  More info at:"
-	ewarn "http://pagesperso-orange.fr/b.andre/advanced-ntfs-3g.html"
-
-	if use suid; then
-		ewarn
-		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
-		ewarn "means that if there any undetected vulnerabilities in the binary,"
-		ewarn "then local users may be able to gain root access on your machine."
-	fi
-}
diff --git a/sys-fs/ntfs3g-ar/ntfs3g-ar-2012.1.15.8.ebuild b/sys-fs/ntfs3g-ar/ntfs3g-ar-2012.1.15.8.ebuild
index 7caec9ae7..8f8112dc0 100644
--- a/sys-fs/ntfs3g-ar/ntfs3g-ar-2012.1.15.8.ebuild
+++ b/sys-fs/ntfs3g-ar/ntfs3g-ar-2012.1.15.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -75,7 +75,7 @@ src_install() {
 	# http://bugs.gentoo.org/398069
 	dodir /usr/sbin
 	mv "${D}"/sbin/* "${ED}"/usr/sbin || die
-	rm -rf "${D}"/sbin
+	rmdir "${D}"/sbin || die 'rmdir failed'
 
 	dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197
 }