3 files changed, 13 insertions, 42 deletions
diff --git a/sys-fs/fatsort/ChangeLog b/sys-fs/fatsort/ChangeLog
index 3ac3d35e6c41..7d8ec526a310 100644
--- a/sys-fs/fatsort/ChangeLog
+++ b/sys-fs/fatsort/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/fatsort
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/ChangeLog,v 1.5 2009/09/30 18:03:10 billie Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/ChangeLog,v 1.6 2010/01/12 18:30:47 billie Exp $
+
+*fatsort-0.9.13.1.206 (12 Jan 2010)
+
+  12 Jan 2010; Daniel Pielmeier <billie@gentoo.org>
+  -fatsort-0.9.10.187-r1.ebuild, -fatsort-0.9.11.196.ebuild,
+  +fatsort-0.9.13.1.206.ebuild:
+  Version bump. Remove old.
 
 *fatsort-0.9.12.199 (30 Sep 2009)
 
diff --git a/sys-fs/fatsort/fatsort-0.9.10.187-r1.ebuild b/sys-fs/fatsort/fatsort-0.9.10.187-r1.ebuild
deleted file mode 100644
index 5759a311c2c9..000000000000
--- a/sys-fs/fatsort/fatsort-0.9.10.187-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/fatsort-0.9.10.187-r1.ebuild,v 1.1 2009/05/29 17:17:02 billie Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-
-DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players."
-HOMEPAGE="http://fatsort.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-	sed -i -e 's:/usr/local/sbin:/usr/sbin:g' src/Makefile || die "sed failed!"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-	DESTDIR="${D}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	doman man/fatsort.8 || die "doman failed"
-	dodoc CHANGES README TODO || die "dodoc failed"
-}
diff --git a/sys-fs/fatsort/fatsort-0.9.11.196.ebuild b/sys-fs/fatsort/fatsort-0.9.13.1.206.ebuild
index 7579478a7799..f452a1640c83 100644
--- a/sys-fs/fatsort/fatsort-0.9.11.196.ebuild
+++ b/sys-fs/fatsort/fatsort-0.9.13.1.206.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/fatsort-0.9.11.196.ebuild,v 1.1 2009/09/28 16:59:52 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fatsort/fatsort-0.9.13.1.206.ebuild,v 1.1 2010/01/12 18:30:47 billie Exp $
 
 EAPI="2"
 
 inherit toolchain-funcs versionator
 
-MY_PV=$(replace_version_separator 3 '-')
+MY_PV=$(replace_version_separator 4 '-')
 
 DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players."
 HOMEPAGE="http://fatsort.berlios.de/"
@@ -20,7 +20,7 @@ IUSE=""
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
-	sed -i -e 's:/usr/local/sbin:/usr/sbin:g' src/Makefile || die "sed failed!"
+	sed -i -e "/^\(MANDIR=\|SBINDIR=\)/s|usr/local|/usr|" $(find ./ -name Makefile)
 }
 
 src_compile() {
@@ -30,6 +30,5 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	doman man/fatsort.8 || die "doman failed"
 	dodoc CHANGES README TODO || die "dodoc failed"
 }