diff options
| -rw-r--r-- | app-admin/ulog-acctd/ChangeLog | 12 | ||||
| -rw-r--r-- | app-admin/ulog-acctd/Manifest | 17 | ||||
| -rw-r--r-- | app-admin/ulog-acctd/files/ulog-acctd-0.4.2-gcc2.patch | 5 | ||||
| -rw-r--r-- | app-admin/ulog-acctd/ulog-acctd-0.4.3-r1.ebuild (renamed from app-admin/ulog-acctd/ulog-acctd-0.4.2.ebuild) | 29 |
4 files changed, 31 insertions, 32 deletions
diff --git a/app-admin/ulog-acctd/ChangeLog b/app-admin/ulog-acctd/ChangeLog index 5bb213dca85a..842271217ffe 100644 --- a/app-admin/ulog-acctd/ChangeLog +++ b/app-admin/ulog-acctd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-admin/ulog-acctd -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/ulog-acctd/ChangeLog,v 1.13 2009/10/12 00:01:00 halcy0n Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/ulog-acctd/ChangeLog,v 1.14 2010/09/28 19:09:54 jer Exp $ + +*ulog-acctd-0.4.3-r1 (28 Sep 2010) + + 28 Sep 2010; Jeroen Roovers <jer@gentoo.org> -ulog-acctd-0.4.2.ebuild, + files/ulog-acctd-0.4.2-gcc2.patch, +ulog-acctd-0.4.3-r1.ebuild: + Clean up patch and do not cd before patching as the path is already set in + the patch. Replace cd;make with emake -C. Set RDEPEND. Respect LDFLAGS + (bug #336959), CC, more CFLAGS. 12 Oct 2009; Mark Loeser <halcy0n@gentoo.org> ulog-acctd-0.4.2.ebuild, ulog-acctd-0.4.3.ebuild: diff --git a/app-admin/ulog-acctd/Manifest b/app-admin/ulog-acctd/Manifest index 556d91098141..b9f371d74c5d 100644 --- a/app-admin/ulog-acctd/Manifest +++ b/app-admin/ulog-acctd/Manifest @@ -1,18 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX init.d/ulog-acctd 476 RMD160 49a19b715b070cfa1f240e24a450599a795ce81e SHA1 83a3e9a9d0105f6ce05eef429b8f7155f4b573ef SHA256 7cb23148cc86762ac3aea8c56ccc16d7373340828dd46eff62f138da43acf42e -AUX ulog-acctd-0.4.2-gcc2.patch 546 RMD160 cd70815dfdb61c14132c0c2be9433ef2128e5611 SHA1 5339b7d504658a73a17f220cae5f04b2cd042cc7 SHA256 edbbf3ae864dfc16d4597751b28cad05b6f761d34de55cbf8dea48bb45749540 -DIST ulog-acctd_0.4.2.orig.tar.gz 33266 RMD160 a9387f7e256d8488bb58e2cea55f46321ea8a998 SHA1 5108afa42b43e40dae71123751abb305d26165a4 SHA256 7c9ca77ff0feba5255a3bbf41fc92069122a377598b81015c9c798daaaa70ca7 +AUX ulog-acctd-0.4.2-gcc2.patch 355 RMD160 632edd58f73807253709bf6638f79a00266ddd78 SHA1 66ebff03bad6e8db475a6befbc9c032a1a3a2555 SHA256 dbb26114a5e8adfb01616253291e2fe54ecf98e3a192dc8de2937c5db579a16c DIST ulog-acctd_0.4.3.orig.tar.gz 33626 RMD160 7c36ea4562e3638ca314627fa3519c5a6c633744 SHA1 9541ba4e5730d38f558015a58597254be98d8764 SHA256 3fdf94f3bb371ba67e28bc03ee570a66f1cd70cc23aee2c6b8a2de19dc4f9dbf -EBUILD ulog-acctd-0.4.2.ebuild 1370 RMD160 bbd646097b7cce4154118ab256cd8a816a83552c SHA1 1055cfb99b662f15444ba456bd5d3bcb55958bdb SHA256 724493d4034d77620647b2b290ddeea8476915af1cfd5e451b8e3c56e1897169 +EBUILD ulog-acctd-0.4.3-r1.ebuild 1401 RMD160 4809c9550a01ade711a12f67299bb06e08f8e1f2 SHA1 4f795cbad264ab267af3fe2ce57358192f36c6b6 SHA256 1407102432c0fb6af7430c2a0dffbce19c9e35030e80d0ba8e8d0c03e29762c0 EBUILD ulog-acctd-0.4.3.ebuild 1384 RMD160 b91419ab1014a30c86a7ef2fa5dcb74289e1f1c2 SHA1 83c03f77c6212c897523510dfd07d2505b10c188 SHA256 24a6e1e4f73413a07ba49ecbc0092a701addc661505490915a5478b73026b3cb -MISC ChangeLog 1786 RMD160 7b24b1cd762aa8072c31e0481b009f6f4ae330d4 SHA1 4a55a07294ce55a8991d3ff1dc6041da975cc6a9 SHA256 a6d5acc0f62a671761cc2ddba0b3042428b4f76dd27d8d2affe21e49bd7d88c0 +MISC ChangeLog 2142 RMD160 3764713cfa2ac09031995f5d83516a01d50a5860 SHA1 e12538e5ea46732ee6b4106233406a1c345cdffd SHA256 086fd5953c96128f8d22f466faf6d218c52a98cb606ac785c58c37bd543a8265 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkrSccEACgkQCRZPokWLroQzDgCgjZA6/4Gd1fIlbb4v/F3f34+s -cQwAoIeczmRJD5xwUy3KAKaSkCUEbpYU -=Fmvb ------END PGP SIGNATURE----- diff --git a/app-admin/ulog-acctd/files/ulog-acctd-0.4.2-gcc2.patch b/app-admin/ulog-acctd/files/ulog-acctd-0.4.2-gcc2.patch index eb99c6a4a7b0..b62480c9e96f 100644 --- a/app-admin/ulog-acctd/files/ulog-acctd-0.4.2-gcc2.patch +++ b/app-admin/ulog-acctd/files/ulog-acctd-0.4.2-gcc2.patch @@ -1,6 +1,5 @@ -diff -ru ulog-acctd-0.4.1.orig/src/process.c ulog-acctd-0.4.1.new/src/process.c ---- ulog-acctd-0.4.1.orig/src/process.c 2003-08-26 15:30:07.000000000 +0200 -+++ ulog-acctd-0.4.1.new/src/process.c 2003-11-08 16:12:40.000000000 +0100 +--- a/src/process.c ++++ b/src/process.c @@ -627,6 +627,7 @@ void wait_children(void) diff --git a/app-admin/ulog-acctd/ulog-acctd-0.4.2.ebuild b/app-admin/ulog-acctd/ulog-acctd-0.4.3-r1.ebuild index 885c1bed25ff..ec72e879bdb7 100644 --- a/app-admin/ulog-acctd/ulog-acctd-0.4.2.ebuild +++ b/app-admin/ulog-acctd/ulog-acctd-0.4.3-r1.ebuild @@ -1,33 +1,36 @@ -# 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/ulog-acctd/ulog-acctd-0.4.2.ebuild,v 1.9 2009/10/12 00:01:00 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/ulog-acctd/ulog-acctd-0.4.3-r1.ebuild,v 1.1 2010/09/28 19:09:54 jer Exp $ -inherit eutils +EAPI="2" + +inherit eutils toolchain-funcs DESCRIPTION="ULOG-based accounting daemon with flexible log-format" -SRC_URI="http://alioth.debian.org/download.php/604/${PN}_${PV}.orig.tar.gz" +SRC_URI="http://alioth.debian.org/download.php/949/${PN}_${PV}.orig.tar.gz" HOMEPAGE="http://savannah.nongnu.org/projects/ulog-acctd/ http://alioth.debian.org/projects/pkg-ulog-acctd" LICENSE="GPL-2" SLOT="0" -KEYWORDS="ppc x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="" DEPEND="net-firewall/iptables" +RDEPEND="${DEPEND}" S="${WORKDIR}"/${P}.orig -src_unpack() { - unpack ${A} - cd "${S}"/src - epatch "${FILESDIR}"/${P}-gcc2.patch +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.4.2-gcc2.patch + sed -i src/Makefile \ + -e 's| -o | $(LDFLAGS)&|g' \ + -e '/^DEBUG/d' \ + || die "sed src/Makefile" } src_compile() { - cd "${S}"/src || die "cannot change to src-directory" - make || die "compile of pgm failed" - cd "${S}"/doc || die "cannot change to doc-directory" - make || die "compile of docu failed" + emake CC=$(tc-getCC) -C src || die "emake src" + emake -C doc || die "emake doc" } src_install() { |