summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-08-22 20:11:30 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-08-22 20:11:30 +0000
commitdfe04a41e5a32eb92e4fbc0549a55dc8e73bfaf1 (patch)
treed93c9d89d64b6f9755d2892edde8775e9a025cbd /media-sound/trommler
parentFix make breakage bug #333461, also allow user to apply conditional patches b... (diff)
downloadhistorical-dfe04a41e5a32eb92e4fbc0549a55dc8e73bfaf1.tar.gz
historical-dfe04a41e5a32eb92e4fbc0549a55dc8e73bfaf1.tar.bz2
historical-dfe04a41e5a32eb92e4fbc0549a55dc8e73bfaf1.zip
Respect LDFLAGS wrt #333741.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-sound/trommler')
-rw-r--r--media-sound/trommler/ChangeLog7
-rw-r--r--media-sound/trommler/Manifest4
-rw-r--r--media-sound/trommler/trommler-3.8.ebuild34
3 files changed, 28 insertions, 17 deletions
diff --git a/media-sound/trommler/ChangeLog b/media-sound/trommler/ChangeLog
index c77559bc38d4..2a82f483b489 100644
--- a/media-sound/trommler/ChangeLog
+++ b/media-sound/trommler/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/trommler
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/trommler/ChangeLog,v 1.25 2009/06/16 18:48:40 klausman Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/trommler/ChangeLog,v 1.26 2010/08/22 20:11:30 ssuominen Exp $
+
+ 22 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> trommler-3.8.ebuild:
+ Respect LDFLAGS wrt #333741.
16 Jun 2009; Tobias Klausmann <klausman@gentoo.org> trommler-3.8.ebuild:
Stable on alpha, bug #272874
diff --git a/media-sound/trommler/Manifest b/media-sound/trommler/Manifest
index 87509f88d25b..03653a3507e1 100644
--- a/media-sound/trommler/Manifest
+++ b/media-sound/trommler/Manifest
@@ -1,5 +1,5 @@
AUX trommler.wrapper 124 RMD160 81134186535dc18671db2a12e6104e651a4f8c6a SHA1 1acb743fc2512dd968d544fadcf0ecc325723468 SHA256 b012e3193fae3d3b621ba9ea165295c485a6572ad7acbf78eb69e6a00bffbb4c
DIST trommler.3.8.tar.gz 805792 RMD160 d4d7c8eb63abf60a7ac1cb5625d41bb99f7a21b7 SHA1 3f7604ac5ec6085f620d6de8dd7144a392dd39ef SHA256 61bce1ddf8a538d1e83cab1927d6317ddf30c1a9cf9542e692a91c1f9682b912
-EBUILD trommler-3.8.ebuild 1267 RMD160 6f9a408d86d03f5c83fd70825b95979c89160167 SHA1 86d786fd442d14ec3e447d9a5d0ccece18ccd855 SHA256 c1b4570d34a8a23df0d8b498927ce81e748a1168465fb1e2fa0ce41779232eb7
-MISC ChangeLog 2885 RMD160 567c631888c838e66055f08d2cc0255c527a63fd SHA1 686bd3ba188104eacbda00b4f5704b2c11c7a9c1 SHA256 482599bf17d0d0a0fb59498e309c0e61ae2b58f35ef8c6cf26b5ce31358f2bba
+EBUILD trommler-3.8.ebuild 1216 RMD160 c76e3e951e6f33e954da21d6df3446736b928d09 SHA1 1a6c2e830f8ff913f7fae5fc1cd4ea20aa516570 SHA256 ca914e64bbf738b403ea4f7ee23110e29c9bf725511ba58189f335cbccd046a6
+MISC ChangeLog 2993 RMD160 ebb931ae5c9eba5d0a1241e26d6845bb107da2aa SHA1 a2db0dda19e42d3779e82cf703693ffef8e0364d SHA256 b2022424da3eda2228172605ae873158dba5afffa839d102828ea432cda22d4a
MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
diff --git a/media-sound/trommler/trommler-3.8.ebuild b/media-sound/trommler/trommler-3.8.ebuild
index d29fcd813ab8..12d6c5841adc 100644
--- a/media-sound/trommler/trommler-3.8.ebuild
+++ b/media-sound/trommler/trommler-3.8.ebuild
@@ -1,6 +1,6 @@
-# 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/media-sound/trommler/trommler-3.8.ebuild,v 1.6 2009/06/16 18:48:40 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/trommler/trommler-3.8.ebuild,v 1.7 2010/08/22 20:11:30 ssuominen Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -22,25 +22,33 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${PN/t/T}
+src_prepare() {
+ sed -i \
+ -e 's:$(CC):$(CC) $(LDFLAGS):' \
+ Makefile || die
+}
+
src_compile() {
- emake export.h || die "emake export.h failed"
- emake CFLAGS="${CFLAGS} $(pkg-config --cflags gtk+-2.0)" \
- CC="$(tc-getCC)" || die "emake failed"
+ tc-export CC
+ emake export.h || die
+ emake CFLAGS="${CFLAGS} -Wall $(pkg-config --cflags gtk+-2.0)" || die
}
src_install() {
exeinto /usr/libexec
- doexe ${PN} || die "doexe failed"
- newbin "${FILESDIR}"/${PN}.wrapper ${PN} || die "newbin failed"
- dobin wav2smp playsample || die "dobin failed"
- if use sox; then
- dobin smp2wav || die "dobin failed"
- fi
+ doexe ${PN} || die
+
+ newbin "${FILESDIR}"/${PN}.wrapper ${PN} || die
+ dobin wav2smp playsample || die
+ use sox && { dobin smp2wav || die; }
+
insinto /usr/share/${PN}/Drums
- doins Drums/*.smp || die "doins failed"
+ doins Drums/*.smp || die
insinto /usr/share/${PN}/Songs
- doins Songs/*.sng || die "doins failed"
+ doins Songs/*.sng || die
+
dodoc CHANGES README
dohtml index.html style.css
+
make_desktop_entry ${PN} Trommler
}