Some Clean up

(Portage version: 2.2.0_alpha12/cvs/Linux x86_64)

4 files changed, 28 insertions, 36 deletions

diff --git a/app-misc/fdupes/ChangeLog b/app-misc/fdupes/ChangeLog
index 2f59147798e5..e7ec148ead4b 100644
--- a/app-misc/fdupes/ChangeLog
+++ b/app-misc/fdupes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/fdupes
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/ChangeLog,v 1.35 2011/01/04 21:57:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/ChangeLog,v 1.36 2011/01/05 18:42:52 jlec Exp $
+
+  05 Jan 2011; Justin Lecher <jlec@gentoo.org> fdupes-1.40-r3.ebuild,
+  fdupes-1.40-r4.ebuild, fdupes-1.50_pre2.ebuild:
+  Some Clean up
 
   04 Jan 2011; Markos Chandras <hwoarang@gentoo.org> fdupes-1.50_pre2.ebuild:
   Stable on amd64 wrt bug #350570
diff --git a/app-misc/fdupes/fdupes-1.40-r3.ebuild b/app-misc/fdupes/fdupes-1.40-r3.ebuild
index cf9c78ee5f9b..f44f7470fd81 100644
--- a/app-misc/fdupes/fdupes-1.40-r3.ebuild
+++ b/app-misc/fdupes/fdupes-1.40-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.40-r3.ebuild,v 1.12 2009/06/16 18:07:05 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.40-r3.ebuild,v 1.13 2011/01/05 18:42:52 jlec Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,28 +13,23 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="md5sum-external"
 
-DEPEND=""
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-memcpy.patch
-	epatch "${FILESDIR}"/${P}-external-md5sum-quotation.patch
+	epatch \
+		"${FILESDIR}"/${P}-memcpy.patch \
+		"${FILESDIR}"/${P}-external-md5sum-quotation.patch
 	if use md5sum-external; then
 		sed -i -e 's/^#EXTERNAL_MD5[[:blank:]]*= /EXTERNAL_MD5 = /g' \
 					Makefile || die "sed failed"
 	fi
-	sed -e 's/-o fdupes/${CFLAGS} ${LDFLAGS} -o fdupes/' -i Makefile
-}
-
-src_compile() {
-	sed -i -e "s:gcc:$(tc-getCC):" Makefile
-	emake || die
+	sed -e 's/-o fdupes/${CFLAGS} ${LDFLAGS} -o fdupes/' -i Makefile || die
+	sed -i -e "s:gcc:$(tc-getCC):" Makefile || die
 }
 
 src_install() {
 	dobin fdupes || die
-	doman fdupes.1
-	dodoc CHANGES CONTRIBUTORS INSTALL README TODO
+	doman fdupes.1 || die
+	dodoc CHANGES CONTRIBUTORS INSTALL README TODO || die
 }
diff --git a/app-misc/fdupes/fdupes-1.40-r4.ebuild b/app-misc/fdupes/fdupes-1.40-r4.ebuild
index bc41659818bf..4a41d4e12751 100644
--- a/app-misc/fdupes/fdupes-1.40-r4.ebuild
+++ b/app-misc/fdupes/fdupes-1.40-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.40-r4.ebuild,v 1.5 2010/11/28 12:14:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.40-r4.ebuild,v 1.6 2011/01/05 18:42:52 jlec Exp $
 
 inherit eutils toolchain-funcs
 
@@ -13,28 +13,23 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sparc x86"
 IUSE="md5sum-external"
 
-DEPEND=""
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-memcpy.patch
-	epatch "${FILESDIR}"/${P}-external-md5sum-quotation-1.patch
+	epatch \
+		"${FILESDIR}"/${P}-memcpy.patch \
+		"${FILESDIR}"/${P}-external-md5sum-quotation-1.patch
 	if use md5sum-external; then
 		sed -i -e 's/^#EXTERNAL_MD5[[:blank:]]*= /EXTERNAL_MD5 = /g' \
 					Makefile || die "sed failed"
 	fi
-	sed -e 's/-o fdupes/${CFLAGS} ${LDFLAGS} -o fdupes/' -i Makefile
-}
-
-src_compile() {
-	sed -i -e "s:gcc:$(tc-getCC):" Makefile
-	emake || die
+	sed -e 's/-o fdupes/${CFLAGS} ${LDFLAGS} -o fdupes/' -i Makefile || die
+	sed -i -e "s:gcc:$(tc-getCC):" Makefile || die
 }
 
 src_install() {
 	dobin fdupes || die
-	doman fdupes.1
-	dodoc CHANGES CONTRIBUTORS INSTALL README TODO
+	doman fdupes.1 || die
+	dodoc CHANGES CONTRIBUTORS INSTALL README TODO || die
 }
diff --git a/app-misc/fdupes/fdupes-1.50_pre2.ebuild b/app-misc/fdupes/fdupes-1.50_pre2.ebuild
index 0f6ac9fbf811..b652e71452cb 100644
--- a/app-misc/fdupes/fdupes-1.50_pre2.ebuild
+++ b/app-misc/fdupes/fdupes-1.50_pre2.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.50_pre2.ebuild,v 1.2 2011/01/04 21:57:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.50_pre2.ebuild,v 1.3 2011/01/05 18:42:52 jlec Exp $
 
 EAPI=3
 
 inherit eutils toolchain-funcs
 
 MY_P="${PN}-${PV/_pre/-PR}"
-DESCRIPTION="identify/delete duplicate files residing within specified directories"
+
+DESCRIPTION="Identify/delete duplicate files residing within specified directories"
 HOMEPAGE="http://netdial.caribe.net/~adrian2/fdupes.html"
 SRC_URI="http://netdial.caribe.net/~adrian2/programs/${PN}/beta/${MY_P}.tar.gz"
 
@@ -16,9 +17,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
@@ -31,6 +29,6 @@ src_compile() {
 
 src_install() {
 	dobin fdupes || die
-	doman fdupes.1
-	dodoc CHANGES CONTRIBUTORS README TODO
+	doman fdupes.1 || die
+	dodoc CHANGES CONTRIBUTORS README TODO || die
 }