Cleanup ebuild/source/patchsets.

(Portage version: 2.1.2)

3 files changed, 25 insertions, 31 deletions

diff --git a/sys-apps/tcp-wrappers/ChangeLog b/sys-apps/tcp-wrappers/ChangeLog
index c64d4f3f303f..f8ffc17d82ba 100644
--- a/sys-apps/tcp-wrappers/ChangeLog
+++ b/sys-apps/tcp-wrappers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/tcp-wrappers
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.38 2006/12/11 02:50:13 flameeyes Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.39 2007/01/17 03:22:59 vapier Exp $
+
+  17 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  tcp-wrappers-7.6-r8.ebuild:
+  Cleanup ebuild/source/patchsets.
 
   11 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
   tcp-wrappers-7.6-r8.ebuild:
diff --git a/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8 b/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8
index 884b867ff2f9..0494715f8510 100644
--- a/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8
+++ b/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r8
@@ -1,6 +1,6 @@
-MD5 3050aa30cb6f4e3aa8f3d6ccefc2bef8 tcp-wrappers-7.6-r8-patches.tar.bz2 19279
-RMD160 965f221530a245317524e66b9bce4e1786ac3ae5 tcp-wrappers-7.6-r8-patches.tar.bz2 19279
-SHA256 d1854fd9943d9653a8c1986033a8112b117f094339227e96d186436a46ce49a5 tcp-wrappers-7.6-r8-patches.tar.bz2 19279
+MD5 e40c4f8f90c274af23a38a698b6d1695 tcp-wrappers-7.6-patches-1.0.tar.bz2 16128
+RMD160 ff714d5d91d1d59ce7824859e66a2ad1b2f9c452 tcp-wrappers-7.6-patches-1.0.tar.bz2 16128
+SHA256 dcb10f194684b16ae6aa9faf05dd8b063d81a3dde1431b664260dcf385089256 tcp-wrappers-7.6-patches-1.0.tar.bz2 16128
 MD5 e6fa25f71226d090f34de3f6b122fb5a tcp_wrappers_7.6.tar.gz 99438
 RMD160 f592fec30f8b76ce8790182185dde709871095e0 tcp_wrappers_7.6.tar.gz 99438
 SHA256 9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d tcp_wrappers_7.6.tar.gz 99438
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild
index 6a43a10f37c4..03d138d63684 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild
@@ -1,51 +1,41 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.23 2006/12/29 22:13:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.24 2007/01/17 03:22:59 vapier Exp $
 
 inherit eutils toolchain-funcs
 
 MY_P="${P//-/_}"
-S="${WORKDIR}/${MY_P}"
+PATCH_VER="1.0"
 DESCRIPTION="TCP Wrappers"
 HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
 SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
-	mirror://gentoo/${PF}-patches.tar.bz2"
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 
 LICENSE="tcp_wrappers_license"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="ipv6"
 
-RDEPEND="virtual/libc"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	chmod ug+w Makefile
-	sed -i \
-		-e "s:-O:${CFLAGS}:" \
-		-e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" \
-		Makefile || die "makefile patch prep"
 
-	PATCHDIR=${WORKDIR}/${PV}-patches
-	epatch ${PATCHDIR}/${P}-makefile.patch.bz2
+	EPATCH_SUFFIX="patch"
+	PATCHDIR=${WORKDIR}/${PV}
+	epatch ${PATCHDIR}/${P}-makefile.patch
 	epatch ${PATCHDIR}/generic
-	epatch ${PATCHDIR}/${P}-shared.patch.bz2
-	use ipv6 && epatch ${PATCHDIR}/${P}-ipv6-1.14.diff.bz2
-
-	# make it parallel/cross-compile friendly.
-	sed -i \
-		-e 's:gcc:$(CC):' \
-		-e 's:@make :@$(MAKE) :' \
-		-e 's:make;:$(MAKE);:' \
-		Makefile || die "sed Makefile failed"
+	epatch ${PATCHDIR}/${P}-shared.patch
+	use ipv6 && epatch ${PATCHDIR}/${P}-ipv6-1.14.diff
 }
 
 src_compile() {
-	tc-export CC
+	tc-export AR CC RANLIB
 
 	local myconf="-DHAVE_WEAKSYMS"
 	use ipv6 && myconf="${myconf} -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
@@ -67,8 +57,8 @@ src_install() {
 	dosbin tcpd tcpdchk tcpdmatch safe_finger try-from || die
 
 	doman *.[358]
-	dosym hosts_access.5.gz /usr/share/man/man5/hosts.allow.5.gz
-	dosym hosts_access.5.gz /usr/share/man/man5/hosts.deny.5.gz
+	dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5
+	dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5
 
 	insinto /usr/include
 	doins tcpd.h