diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-13 23:41:52 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2008-11-13 23:41:52 +0000 |
| commit | ce8880cb8e8c30ea336633a145300dd171e829c8 (patch) | |
| tree | 446275d9ad69cb16904147e7f3d71fd15d8355b3 /x11-misc | |
| parent | ktoblzcheck bump (diff) | |
| download | historical-ce8880cb8e8c30ea336633a145300dd171e829c8.tar.gz historical-ce8880cb8e8c30ea336633a145300dd171e829c8.tar.bz2 historical-ce8880cb8e8c30ea336633a145300dd171e829c8.zip | |
Fix --as-needed (bug #141709), make it respect the CC variable, die on build failure, make it build with parallel make.
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/habak/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/habak/Manifest | 10 | ||||
| -rw-r--r-- | x11-misc/habak/habak-0.2.5.ebuild | 25 |
3 files changed, 30 insertions, 11 deletions
diff --git a/x11-misc/habak/ChangeLog b/x11-misc/habak/ChangeLog index f7f8b8bfc639..52b812f3daac 100644 --- a/x11-misc/habak/ChangeLog +++ b/x11-misc/habak/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/habak # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/habak/ChangeLog,v 1.37 2008/11/13 23:28:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/habak/ChangeLog,v 1.38 2008/11/13 23:41:52 flameeyes Exp $ + + 13 Nov 2008; Diego Pettenò <flameeyes@gentoo.org> habak-0.2.5.ebuild: + Fix --as-needed (bug #141709), make it respect the CC variable, die on + build failure, make it build with parallel make. 13 Nov 2008; Diego Pettenò <flameeyes@gentoo.org> habak-0.2.5.ebuild: Revert the "fix" for --as-needed, since it's actually breaking it more. diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest index 846a3ec188b4..653d709286c0 100644 --- a/x11-misc/habak/Manifest +++ b/x11-misc/habak/Manifest @@ -3,13 +3,13 @@ Hash: SHA1 AUX README.en 6729 RMD160 7dc2844639caa6f26c0cddfe4fb05d5a6e501bed SHA1 1214eded439acdbd1033051a202648055aae7901 SHA256 af228337ec965b76b4287cb35d36df28427a8ba947eb000a6f00bcf874a6bf05 DIST habak-0.2.5.tar.bz2 22657 RMD160 428a4b22b42f4f0cd26cd088dd2c7b6a61d04f08 SHA1 fdfc11a6893492fe4eb48a1d48a5e8a008bb815b SHA256 a4cdd16c34a147c8cba8dd3fdcfe9c55b762a77476ff69fcc5b79f2859660005 -EBUILD habak-0.2.5.ebuild 972 RMD160 a777822d142f81e0a485cc3a58a4eff237b6258f SHA1 931f3ecbf2df29b1a3a343cf9e070ae81650d9b5 SHA256 102c774fdaf164d24bd330df73320b6420ee4dd9a4d7928ae044fcde2d0eeb7a -MISC ChangeLog 4646 RMD160 55f3d4d91e85c016389326b2cbe334c2ed12a2d6 SHA1 fed1537a424d0dff99516494972b9769e59279f2 SHA256 b4db1a77cc07e05faae79146dae0b8188e6f48c9fb430359ed795be4acd68f30 +EBUILD habak-0.2.5.ebuild 1352 RMD160 eec9c99667245919fbdfd10b18f48ecfebdc9729 SHA1 d299629ddf89a095ad3bf0b2e7557165f7b6ff30 SHA256 f6f8039ade04c834a2b28ed4a82034044c530f6a56a4848595c4d3b49de881e6 +MISC ChangeLog 4844 RMD160 9de46d481ad2caf85611c9bcb150ee22ab3098ed SHA1 52aa39d776a8ac00c49045c89712803db9a1b5f8 SHA256 07e8623b86902360521094b2ff6915039a34adfa2d16f5c4d4e469d60ca9e2d4 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkcuDkACgkQAiZjviIA2XgLlwCfaA417i9PC0vJUoVoFf6hbk1K -FbAAnjDgTczD+5Wbule/+w21WgWUyLxW -=qMgx +iEYEARECAAYFAkkcu0QACgkQAiZjviIA2XgYvgCaAlYu9D7CqjzoVv1C4bdFLb1r +aQYAoMSN2l2nx1q3KK7BKuvdWg8Io13Z +=ghwM -----END PGP SIGNATURE----- diff --git a/x11-misc/habak/habak-0.2.5.ebuild b/x11-misc/habak/habak-0.2.5.ebuild index 9ffa29be34fb..2fd268063154 100644 --- a/x11-misc/habak/habak-0.2.5.ebuild +++ b/x11-misc/habak/habak-0.2.5.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/habak/habak-0.2.5.ebuild,v 1.18 2008/11/13 23:28:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/habak/habak-0.2.5.ebuild,v 1.19 2008/11/13 23:41:52 flameeyes Exp $ -inherit eutils +inherit eutils toolchain-funcs DESCRIPTION="A simple but powerful tool to set desktop wallpaper" HOMEPAGE="http://lubuska.zapto.org/~hoppke/" @@ -18,6 +18,10 @@ RDEPEND="media-libs/imlib2 DEPEND="${RDEPEND} x11-proto/xproto" +# Skip into the src directory so we avoid a recursive make call that +# is going to break parallel make. +S="${WORKDIR}/${P}/src" + pkg_setup() { # fix for bug #185144 if ! built_with_use media-libs/imlib2 X; then @@ -27,11 +31,22 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + + sed -i \ + -e '/(LDFLAGS)/s:$: -lImlib2 -lm:' \ + -e 's:gcc:$(CC):' \ + "${S}"/Makefile || die "Makefile fixing failed" +} + src_compile() { - emake || die "make failed" + emake CC="$(tc-getCC)" ${PN} || die "make failed" } src_install() { - dobin habak - dodoc ChangeLog README TODO COPYING "${FILESDIR}"/README.en + dobin ${PN} || die "dobin failed" + + cd "${WORKDIR}/${P}" + dodoc ChangeLog README TODO "${FILESDIR}"/README.en || die "dodoc failed" } |