Version bump.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

4 files changed, 85 insertions, 5 deletions

diff --git a/sys-fs/fatsort/ChangeLog b/sys-fs/fatsort/ChangeLog
index dd3e6a5b1a63..5841902b4f66 100644
--- a/sys-fs/fatsort/ChangeLog
+++ b/sys-fs/fatsort/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/fatsort
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/ChangeLog,v 1.36 2013/10/13 14:03:38 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/ChangeLog,v 1.37 2013/12/12 17:27:41 billie Exp $
+
+*fatsort-1.2 (12 Dec 2013)
+
+  12 Dec 2013; Daniel Pielmeier <billie@gentoo.org> +fatsort-1.2.ebuild,
+  +files/fatsort-1.2-tests.patch:
+  Version bump.
 
   13 Oct 2013; Daniel Pielmeier <billie@gentoo.org> fatsort-1.1.1.ebuild,
   +files/fatsort-1.1.1-test-results.patch:
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index 2b857b7570ff..46bfac2c990f 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 AUX fatsort-1.1.1-test-results.patch 802 SHA256 afb322b4cbe999d2e00277d7d1e191d34193a03eff1d1aeb4fe4655da274161c SHA512 028d6dd63121d73529599cbe39ca9b1bc069a46480950215bac940706063cf78535a441c352711359b34a7463183e4db375c9cc5f5290de65dad4c8a15ff1b49 WHIRLPOOL a14c5c18aae4e4cabd533100a1646b61e39e340ac6aeb53fa5fed3422da160e22f7cd847470aa5f8b5537f96f12f479f795650978c7e4a02d596bb6a6ebfa39e
+AUX fatsort-1.2-tests.patch 1562 SHA256 fd80fccb22413a01e8b1232220aa41ec1000ff86492e57575c06c1d7e4ddd5ac SHA512 859445f881d01fa778fd899835b1e702261fb179ca5c730c6244438801843b4836d26ce7d3746c08f9865e4acd9d94a5584d128da36481fd5528f3e9e11d26a7 WHIRLPOOL aec64f495e85eddbf8046a6ae6c75223bd9ec7d67b625f8dfe20ad8720159b596a85d4e9f591add54994ca63c45d8e36b8efdde7857c03e214b92ebf31b5db73
 DIST fatsort-1.1.1.336.tar.gz 55232 SHA256 e4c8212dffc94f62a15b557133e7a9acaf55ff17f5f22a655a67ac8cc36aee7c SHA512 8079cebf29cfd9995e6b5152f4e16c3ae7621949b38b3b8e0d438e97dc9081ddf613dd3189eb11fad6e00dab0064d962f41414b1adacb4a6923df4802db7a797 WHIRLPOOL 3174b552e1ac79ce3165b34777f6408c62c4803d6d9e3f15e62c82111a87d85e69ffb80799a22a5d0e67702e9ea2c09614ca4a0649a87a6a25510c604a80f9bd
+DIST fatsort-1.2.355.tar.gz 56034 SHA256 86bc350bd72c96aa83a456f9874c529d2db1b2bf65f00a19356eb3fb73c1ac23 SHA512 54e1cfa20409e77b9c333d21463583c2698340599f65fcc3d845d9b921b0bd284232ad2aa6ddb2d4c8fb00acb16e150a72b15e00347fb069bb346e7cdc4218cb WHIRLPOOL 652c0a50821c9601a5eb7d646af3c358ef2580f5b1322b766b66b81c390859827067dc212a061cede94eb7677937b9618a754f39cfc51da7d01b7d899fad6e9b
 EBUILD fatsort-1.1.1.ebuild 936 SHA256 dd2e274ddf165876032f1e4108977b72828f0f92b50f89082ad149441e73cc4e SHA512 bcdacefbd771490033f97d2ed9fd17911ebadb13a4ce2d2f69ab84a936fc14db5630b4ffb0e08dbc989b7ce4b84cd19bf025cbe931428701ea9ec87449fc2824 WHIRLPOOL 8a5db193389fe7945447ec20fc74c01caa04c2a5fa45a77be3846c4b1917ecb1f9a1bc3768a9cffd534a5198b9eeba8787f953e9cf61ebd8f8fd9f5f82cbb1fc
-MISC ChangeLog 5230 SHA256 df10867afb1445931ce18a6a6b0155425ef2866c63dfe65f3083479f069c99ee SHA512 978058d8a26074a4878b7b4808886b021a89985c4dca5a37ebc880cdc62c18c4a24a11b6d2f9ff579533e8bd8ee1999021d3aa0f513d3984e8112578f1bb60af WHIRLPOOL 2e408dff61dcb54b9a2ee93a48c9473324cd4a368e0dbce4b9a75eb2b6b550bb8e7fc53d79581c5e1f20a441106570d6eb5a96265929d22c046c023e02a8455a
+EBUILD fatsort-1.2.ebuild 929 SHA256 d48006abb7b4483c4ec0d2ebb58ee47633c52e8d116cf31583f979d5d93874b8 SHA512 7b763d181961af110b0254632f75fa156273b656bf0b92b77ba98516ae355fd25b0323e6fac5bcce570681da8762a8b4251c58a278aef83d71bd28e161cdc6d3 WHIRLPOOL 9c0380468fd2861fa23162ba3c2d359b707a84855dee3d33db60f8ae84bcfe369dbd94d3cd1f8f1566c6321da56aba95044f8bb6e297d6e004769760569c3950
+MISC ChangeLog 5382 SHA256 ff1603589e9333d800a7cc59dd79ae07b2ee17993a7bb9537f8287e9fe17d77f SHA512 dbbe226e306eebdb7e80fddd77668395bd944e7a47e4e31ae103364d41699348ae8de906290fcd37c7015559d1b6de9fa20d9afbf83f014ae80a3940a379ae38 WHIRLPOOL ce0b83541f520ea3bd0de9ad646c3bc571f2c421f0f92aa312917dbd5fa469044f0e44089d13a047403c78f849dfff301e7ef2c749c2bed3a3e61ccd6a03c44e
 MISC metadata.xml 649 SHA256 692b5e44fff655da359023ac38f686c8c4c0064977f04d02e1bd424103a92a80 SHA512 64fa1d9804a755457006a0cfc6e2e416644222504d8b55da9b005c3b3b7fc224ab4a1fe958eb814393468647f374c3750fa313063ecddc7bc7bde5bba062fc3f WHIRLPOOL 6f220b0683f7a1a6665586fdcc88cda25b3403783dbccfdbd890f502cdebab5c4e04b84e193bec845a6ad59704e95c041c571834eff46f1610bf51aae35824a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJaqEAACgkQlcuUeyFa0U2TRwCg10pIRXCdBF7ArHU5AS/RUqtG
-Cn0AoNsj5jBfBRyUbV6QoxVzCvfr1KhV
-=QBEU
+iEYEAREIAAYFAlKp8hEACgkQlcuUeyFa0U1r+QCfYaF9f1dji/s2Nj75FYuEnUkE
+PGgAoICZAfyzOovuPwR0t9BweuYM57q+
+=a6R8
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/fatsort/fatsort-1.2.ebuild b/sys-fs/fatsort/fatsort-1.2.ebuild
new file mode 100644
index 000000000000..d70267656366
--- /dev/null
+++ b/sys-fs/fatsort/fatsort-1.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/fatsort-1.2.ebuild,v 1.1 2013/12/12 17:27:41 billie Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+SVN_REV=355
+MY_P=${P}.${SVN_REV}
+
+DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players."
+HOMEPAGE="http://fatsort.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-util/bbe sys-fs/dosfstools )"
+
+RESTRICT="test? ( userpriv )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i -e '/^\(MANDIR=\|SBINDIR=\)/s|/usr/local|/usr|' \
+		$(find ./ -name Makefile) || die
+	epatch "${FILESDIR}/${P}-tests.patch"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		DESTDIR="${D}"
+}
+
+src_test() {
+	make tests
+}
diff --git a/sys-fs/fatsort/files/fatsort-1.2-tests.patch b/sys-fs/fatsort/files/fatsort-1.2-tests.patch
new file mode 100644
index 000000000000..6fc44e23efcb
--- /dev/null
+++ b/sys-fs/fatsort/files/fatsort-1.2-tests.patch
@@ -0,0 +1,30 @@
+diff -Naur tests/tc_check_consistent_version/Makefile tests/tc_check_consistent_version/Makefile
+--- tests/tc_check_consistent_version/Makefile	2013-12-10 21:52:36.773278926 +0100
++++ tests/tc_check_consistent_version/Makefile	2013-12-10 21:52:43.783278646 +0100
+@@ -2,8 +2,8 @@
+ 
+ all: 
+ 	manver=\
+-	`head -1 ../../man/fatsort.1 | sed -e "s/.* \([0-9.]*\)\"$$/\1/"`; \
+-	progver=`../../src/fatsort -v | head -1 | sed -e "s/^.* \([0-9.]\+\) .*$$/\1/"`; \
++	`head -2 ../../man/fatsort.1 | tail -1 | sed -e "s/^.*\"fatsort \([0-9.]\+\)\".*$$/\1/"`; \
++	progver=`../../src/fatsort --version | head -1 | sed -e "s/^fatsort \([0-9.]\+\).*$$/\1/"`; \
+ 	changesver=`head -1 ../../CHANGES | sed -e "s/^.*v\([0-9.]\+\)$$/\1/"`; \
+ 	echo "#$$manver#$$progver#$$changesver#"; \
+ 	[ "$$manver" = "$$progver" ]; \
+diff -Naur tests/tc_pos_sort_modification_time/Makefile tests/tc_pos_sort_modification_time/Makefile
+--- tests/tc_pos_sort_modification_time/Makefile	2013-12-10 21:52:36.772278926 +0100
++++ tests/tc_pos_sort_modification_time/Makefile	2013-12-10 21:57:06.433268173 +0100
+@@ -44,10 +44,11 @@
+ 	sudo mount -o loop,codepage=850,iocharset=iso8859-1,utf8,uid=${MOUNT_UID},gid=${MOUNT_GID} ${FS_IMG} ${MOUNT_POINT}
+ 	cat ${DIRECTORIES} | while read dir; do mkdir -p "${MOUNT_POINT}/$$dir"; done
+ 	cat ${FILES} | while read file; do touch "${MOUNT_POINT}/$$file"; done
+-	sleep 3
++	sleep 1
+ 	touch ${MOUNT_POINT}/last # alter modification time
++	sleep 1
+ 	touch ${MOUNT_POINT}/first -t 200001010101.01
+-
++	sleep 1
+ 	sudo umount -l ${MOUNT_POINT}
+ 	rmdir ${MOUNT_POINT}