Bump, remove slightly braindead version

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 23 insertions, 32 deletions

diff --git a/app-admin/python-updater/Manifest b/app-admin/python-updater/Manifest
index 95f3fda29d5b..a151a1fed83f 100644
--- a/app-admin/python-updater/Manifest
+++ b/app-admin/python-updater/Manifest
@@ -3,7 +3,7 @@ DIST python-updater-0.7.tar.bz2 6436 RMD160 e85d3bbfd87f640c1c540855126ccd85ff07
 DIST python-updater-0.8.tar.bz2 8137 RMD160 8988317da5d93046753fcd254c177cc2118aa06e SHA1 6a312a6ba9c23506990618af6072521a4deee9c1 SHA256 9e9cec0921fca089fa49fb72cbab5e9374a52c951febc377bbed02ac0142ba4f
 EBUILD python-updater-0.7-r1.ebuild 907 RMD160 2c4d57af9a34543abf3fbeef7f9d14c276f84b01 SHA1 f7e44b90862d6298f5d68307a19f2d0b980b2991 SHA256 49290f1c0cd5f6127837dbd4adee12344cbcf4f6e21cf466b68bcb6caa855256
 EBUILD python-updater-0.7.ebuild 768 RMD160 58db371b183df78cdf2b4a7dea3c2481057f6279 SHA1 1f3354402e6d8a922b4e965182f06c5070e826e7 SHA256 6538361b896ad16bb99b4125298dbdd2849e1bc1dcf1ec85adac8df671820cef
-EBUILD python-updater-0.8.ebuild 792 RMD160 9593444f9c20dbb86289f8afa64d9e31e0c1e103 SHA1 9f8618387e919ad109780caff7834923cc35a00e SHA256 0587494576b0d3edb60d13ed8a5297473dd0b1981187ee59ae64eb446cf11084
+EBUILD python-updater-0.8.ebuild 793 RMD160 ac571b5aaf5f8c21a2a7688f2e5fd84ab55ddb0b SHA1 fbab1d0997063acf1a5f13919dbbc54ac168db13 SHA256 d7b77864564b059570667f8e36fee50bfef48faccaf2e903cc9dec61172fdcfb
 EBUILD python-updater-9999.ebuild 886 RMD160 2719fc29600aaf14cd33d2f84c36097a36773d72 SHA1 1d2969bd9985b86f9877934b028823c6d0afcc88 SHA256 60bffbf96b5231943923bf8bfd2054a7bfcd3b5994b9794441da9251a46312a9
-MISC ChangeLog 6614 RMD160 9f2c3debeddc8bf299f5e72ff74d3adb9c1e69af SHA1 8c61e503b67d20300de4e9627cfa6b10351e6bf7 SHA256 0525b6b63a305c3d5e2441ee229f0db57e21a1fc768f17c2e75aac79af98eef4
+MISC ChangeLog 6769 RMD160 e95589aaf4047e14b75fe5cb2935f5bece69a03e SHA1 98c00fc2a7bab864f8b0f75aca938fb3113b7e32 SHA256 8a51fd645d4428d87243bc648ae045bb17a25c3133dfb54bcae2ca90d35f6765
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog
index 8a29d7406147..a175c3efc5e7 100644
--- a/app-admin/tripwire/ChangeLog
+++ b/app-admin/tripwire/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/tripwire
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.32 2009/11/19 13:10:42 cla Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.33 2010/05/17 18:41:56 patrick Exp $
+
+*tripwire-2.4.2 (17 May 2010)
+
+  17 May 2010; Patrick Lauer <patrick@gentoo.org> -tripwire-2.4.1.2.ebuild,
+  +tripwire-2.4.2.ebuild:
+  Bump, remove slightly braindead version
 
   19 Nov 2009; Dawid Węgliński <cla@gentoo.org> tripwire-2.4.1.2.ebuild:
   Drop EPATCH_OPTS as they are not longer needed and make problems with
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index d511e08b7809..0241e0e79960 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -12,11 +12,12 @@ AUX twcfg.txt 604 RMD160 430439e5fa5ae93efb5fc769c40e5b97daf466b7 SHA1 81b02a9e2
 AUX twinstall.sh 10100 RMD160 e316719b100990112dc005964ec8bab73828a322 SHA1 272743b42e2fcc72f8581eeb1b2a0a706511da31 SHA256 edc9c96dee54c1564de52ca5e755bfdac42a35d5b821a97d4342d6121ffe433d
 DIST tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2 739663 RMD160 e3d5b9e2dcadcd6ce58942de463f0fa6ed097747 SHA1 1e7ee53ed5cd4b4a4a0d257772b6ae850714456d SHA256 a430bf6de02360c562344b8b5277d9ddd3fbf5ccb80d12782ff47a5be9c2999d
 DIST tripwire-2.3.1-2.tar.gz 1514955 RMD160 8d3abee490a6fac22226ca0562faa7d229905f09 SHA1 9ae70cae2b526c83c857a2391a8a530de99433fc SHA256 d339fbc093ce9e9f0c98fa2b454735bb2c13613103d6edcfcce57dbd3a394d2a
+DIST tripwire-2.4.2-src.tar.bz2 708623 RMD160 fbee0d5fa7d87e2014d2dda3018021f3d89b1f68 SHA1 70f141a0b3481869395ed706e112227ea5a93b79 SHA256 af89a368ed25a0edd7283fffa05a3b659e06f693626b947644dec60d0dc482b7
 DIST tripwire.gif 4679 RMD160 246cba58618cc4ed408d74eede5d4a6b8306d4f2 SHA1 8c804dfee7c0a0083812eeb24208a948a4b9bcbc SHA256 569274b35357140e5543aefea4dc6d7db7047965d2f5d054536806a96314d869
 DIST tripwire_2.3.1.2-6.1.diff.gz 608867 RMD160 dcc8bc8ed41022c31ca932c86a0998ff0ba80382 SHA1 52b6abf718d118dce1b66ad7e144ea4a4ec3717c SHA256 29284dcf6f464e6624d57e24ba692eb6fc0b04eafe1d0f96b41be6d058e58cc0
 DIST twpol.txt.gz 7586 RMD160 16ef7751a45fe8dd4656e1834919a314ece64ba2 SHA1 ff65130adcf144b0b4777b78858ddf790504eede SHA256 22a815584d8586dc5fd737749ca53435088d5867355bb6b73ec152b2ef53b5fe
 EBUILD tripwire-2.3.1.2-r1.ebuild 2867 RMD160 2edd79bff9fbbe134ab591f61713b843fcd789e4 SHA1 14f75a1898ae09914d546cfd9c45783ce85eddf1 SHA256 f5a6dfbd9da5b06cec9f3e2c625a7b76ea444add02233b19f319d59523847292
 EBUILD tripwire-2.3.1.2-r2.ebuild 2636 RMD160 61ccb145c7a255214f53bf81bcf4fbe314f23573 SHA1 a7b048c62f2acd0d72a0fabf70516d2374bd2dc7 SHA256 4fda3ab3ab15b3d21c77cedc941a015aaa0b60681c9d52c705bf876bd49fe4cc
-EBUILD tripwire-2.4.1.2.ebuild 2596 RMD160 c738f91777b0df269f04fc6b8d3381b3f9c23133 SHA1 9444aab120f772c1012eb21ba669d3dd33ee9e2d SHA256 2946272764efa058eff93e7aa5b16de45f2f829ba0b0edc6b7635c84a5d1c2ef
-MISC ChangeLog 5328 RMD160 246639728f155dcdf8191139edf87d37a285bddc SHA1 d2bd7eed8b12d570cccea28e8e1672d538ecdff3 SHA256 6effb79d5206b2bfc604b4a832bfd0139ec06ed7719217384668d777ae2a29af
+EBUILD tripwire-2.4.2.ebuild 1999 RMD160 83edc60c1e4fb81dbb3f13cd8a39ee0eb2596870 SHA1 4a82942cbd52c6319c2dd9375160c5f58741ec23 SHA256 cd5090f27cdf0d6f604fcfc1a0aae9da4b0a1257c3051fb1f33221399c6705c5
+MISC ChangeLog 5508 RMD160 527f9299f00907183f18c028547e0512f8d5da29 SHA1 2f252dcda1f1c3edc3dbd424edf5735d85a1a13c SHA256 aeee35264afb3462d23e367871cf7a905d851b8de34fc13ec64bee322418043a
 MISC metadata.xml 604 RMD160 01d2deb554b218a28b5af398111c44aa932ac2ef SHA1 1e8a1147bbb96033bcf57db9007343c02dd73d07 SHA256 003e3a92b43f01e161bf9af4a28416a4285976c685c0fa41a4065efaa7c5d8b3
diff --git a/app-admin/tripwire/tripwire-2.4.1.2.ebuild b/app-admin/tripwire/tripwire-2.4.2.ebuild
index e1540c459042..df75a7942f8f 100644
--- a/app-admin/tripwire/tripwire-2.4.1.2.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.2.ebuild
@@ -1,14 +1,15 @@
-# 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/app-admin/tripwire/tripwire-2.4.1.2.ebuild,v 1.5 2009/11/19 13:10:42 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.4.2.ebuild,v 1.1 2010/05/17 18:41:56 patrick Exp $
+
+EAPI="2"
 
 inherit eutils flag-o-matic autotools
 
-TW_VER="2.3.1-2"
+TW_VER=${PV}
 DESCRIPTION="Open Source File Integrity Checker and IDS"
 HOMEPAGE="http://www.tripwire.org/"
-SRC_URI="mirror://sourceforge/tripwire/tripwire-${TW_VER}.tar.gz
-	mirror://gentoo/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
+SRC_URI="mirror://sourceforge/tripwire/tripwire-${TW_VER}-src.tar.bz2
 	mirror://gentoo/twpol.txt.gz
 	mirror://gentoo/tripwire.gif"
 
@@ -25,38 +26,21 @@ RDEPEND="virtual/cron
 	virtual/mta
 	ssl? ( dev-libs/openssl )"
 
-S="${WORKDIR}"/tripwire-${TW_VER}
-
-src_unpack() {
-	# unpack tripwire source tarball
-	unpack tripwire-${TW_VER}.tar.gz
-	unpack twpol.txt.gz
-	cd "${S}"
-
-	# Paul Herman has been maintaining some updates to tripwire
-	# including autoconf support and portability fixes.
-	# http://www.frenchfries.net/paul/tripwire/
-	epatch "${FILESDIR}"/tripwire-friend-classes.patch
-	epatch "${DISTDIR}"/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
-	epatch "${FILESDIR}"/tripwire-2.3.0-50-rfc822.patch
+S="${WORKDIR}"/tripwire-${TW_VER}-src
 
+src_prepare() {
 	eautoreconf || die "eautoreconf failed"
 }
 
-src_compile() {
+src_configure() {
 	# tripwire can be sensitive to compiler optimisation.
 	# see #32613, #45823, and others.
 	# 	-taviso@gentoo.org
 	strip-flags
 	append-flags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
-
-		ebegin "	Preparing Directory"
-			mkdir "${S}"/lib "${S}"/bin || die
-		eend
 	einfo "Done."
 	chmod +x configure
 	econf $(use_enable ssl openssl) $(use_enable static)
-	emake || die
 }
 
 src_install() {
@@ -68,7 +52,7 @@ src_install() {
 	exeinto /etc/cron.daily
 	doexe "${FILESDIR}"/tripwire.cron
 
-	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
+	dodoc ChangeLog policy/policyguide.txt TRADEMARK \
 		"${FILESDIR}"/tripwire.txt
 
 	insinto /etc/tripwire