diff options
| author |   Joe Sapp <nixphoeni@gentoo.org> | 2011-08-31 21:25:28 +0000 |
|---|---|---|
| committer | Joe Sapp <nixphoeni@gentoo.org> | 2011-08-31 21:25:28 +0000 |
| commit | 44111eff4bfb8985fe94119705509546cc9a45a8 (patch) | |
| tree | 67d87032f3f7d6dfd871db7bcbfec8b530c19622 /media-sound/xwax | |
| parent | Fix as-needed issue (bug #381345). (diff) | |
| download | historical-44111eff4bfb8985fe94119705509546cc9a45a8.tar.gz historical-44111eff4bfb8985fe94119705509546cc9a45a8.tar.bz2 historical-44111eff4bfb8985fe94119705509546cc9a45a8.zip | |
Addressed the inadvertent use of git during compile
Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
Diffstat (limited to 'media-sound/xwax')
| -rw-r--r-- | media-sound/xwax/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/xwax/Manifest | 14 | ||||
| -rw-r--r-- | media-sound/xwax/xwax-1.0.ebuild | 15 |
3 files changed, 26 insertions, 10 deletions
diff --git a/media-sound/xwax/ChangeLog b/media-sound/xwax/ChangeLog index 2eff0b5a165c..447245196088 100644 --- a/media-sound/xwax/ChangeLog +++ b/media-sound/xwax/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/xwax # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.34 2011/08/04 02:43:12 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.35 2011/08/31 21:25:28 nixphoeni Exp $ + + 31 Aug 2011; Joe Sapp <nixphoeni@gentoo.org> xwax-1.0.ebuild: + Compressed sed in src_prepare() and use it to really eliminate the dependency + on git. Combined with passing VERSION to emake, this sets the right version + without git. *xwax-1.0 (04 Aug 2011) diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest index 88c3529d7899..5d447079e2d1 100644 --- a/media-sound/xwax/Manifest +++ b/media-sound/xwax/Manifest @@ -1,8 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST xwax-0.8.tar.gz 47660 RMD160 ce974475cc7b36d9362513f0951adff00c11569c SHA1 f72199faf79cea9025b69daf703a1b6e51140d76 SHA256 552ebbac9edfc6d85b269ca49170cf7f89b48702e683da6ab02f8878bfa8fd58 DIST xwax-0.9.tar.gz 52835 RMD160 12e7c1d90c90ba2c0c8c4d2a14751aa33f571bcc SHA1 1c440a82471d4fb0049ba81f5823f038e1f664e4 SHA256 bc51bb5a19ec68ceaba7fb5f63c31481c8e8958d82d460ac45abbb4565dde106 DIST xwax-1.0.tar.gz 54094 RMD160 cd8503395e85477955d7b632a6cca030c5b7879a SHA1 6836fa6028f63be366517a9caf44576ab60c2201 SHA256 8d5617bb11c964e9ec5b85ed9a3f004d4f0728ca0ae65b238443404c5bc0358d EBUILD xwax-0.8.ebuild 2649 RMD160 55827c6da33928640b0364a965c554c2217455c2 SHA1 cbb38885588ed643c23d212a24a32f4ed9801e31 SHA256 0be55923bdcb2b1c90cdc0d28a8a968962c6b67283a4bf14fb45409cd755e177 EBUILD xwax-0.9.ebuild 2491 RMD160 4f550a516dec5aa79b46485f1e78d52c1b8e6e69 SHA1 f2fedb3f07e405bf11dee7c6ddd9ff30be18a24c SHA256 96cf2baf1d89f731fce0b3514183f96d32d9e5c91430db344bcc9fdb24e088b3 -EBUILD xwax-1.0.ebuild 2359 RMD160 48022a07d8c429647f9346dd9805b0183ff338b5 SHA1 9115061f9a4b95c387160cd6eb01af5db6b23e69 SHA256 373b2036f99301115c3ed8d79964ae1ea951b3116ae77bfa5ef392aa2f81457f -MISC ChangeLog 5215 RMD160 a223a544ecbd66fc5f7bf39f3c822968d05e5343 SHA1 8b331f0b5a473de04b2b799b32acf3dcbcd5d8ee SHA256 89fbfa074a4cdd0d71b582f2369ffe5f2836f63c5cc243a4abb3828bc6f0cff4 +EBUILD xwax-1.0.ebuild 2376 RMD160 c1af848c76a6404a43357a29ade8abe8b2438a47 SHA1 bee181e7b780cc5f6c2f9aa7cdf103a350db0e14 SHA256 6f749d81f3eb01382b0f4ce12b91bca8a00298892ac1a78479c9448a160396b3 +MISC ChangeLog 5453 RMD160 5141dd753eb0b290ce8ba1e58701cd221f825647 SHA1 6b0b9296dc2e715662f6728fbdc5e70f09bc528d SHA256 bbaf96bfc577b091df6e80df714d77359e7d54bae993a0f0780b2c1798fdc893 MISC metadata.xml 1232 RMD160 da6ef6ba859ba6adaa6c258a5a29128551e1988e SHA1 f5195e554ced97a966f8774008451d8234b003c3 SHA256 3d4ed19e666eecab3d091124d841127fd915f18fcaa7616eb0a854a60d228323 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk5epwAACgkQguHVVE4VAzrwTAD8DBD03jLeJ3ZF6tJYa68UWgd0 +oLU6CFAzARTGAOB/wVwA/37XpEe4RpjEIZ1hgU9SRxtNqTLW/CVFq+XLMv/jtyax +=lD8t +-----END PGP SIGNATURE----- diff --git a/media-sound/xwax/xwax-1.0.ebuild b/media-sound/xwax/xwax-1.0.ebuild index 504f8ffbe900..6a5daefbad4d 100644 --- a/media-sound/xwax/xwax-1.0.ebuild +++ b/media-sound/xwax/xwax-1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.0.ebuild,v 1.1 2011/08/04 02:43:12 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.0.ebuild,v 1.2 2011/08/31 21:25:28 nixphoeni Exp $ EAPI=4 inherit toolchain-funcs @@ -16,7 +16,8 @@ IUSE="alsa jack oss cdda mp3 +fallback" REQUIRED_USE="|| ( cdda mp3 fallback ) || ( alsa jack oss )" -RDEPEND="media-libs/libsdl +RDEPEND="sys-libs/glibc + media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) @@ -31,10 +32,10 @@ DOCS="README CHANGES" src_prepare() { # Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in # the Makefile - # Also replace VERSION so we don't have to depend on git... - sed -i -e 's:\(^CFLAGS.*\)-O[0-9]\(.*\):\1\2:' \ - -e 's:\(^LDFLAGS.*\)-O[0-9]\(.*\):\1\2:' \ - -e "s:\(^VERSION =\).*:\1 ${PV}:" \ + # Also remove the dependency on the .version target so we don't need + # git just to build + sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \ + -e 's/^xwax\.o:.*\.version//' \ Makefile || die "sed failed" # Replace any decoder commands in the import script, if necessary @@ -66,7 +67,7 @@ src_configure() { src_compile() { # EXECDIR is the default directory in which xwax will look for # the 'xwax-import' and 'xwax-scan' scripts - emake EXECDIR="${EROOT}usr/bin" + emake EXECDIR="\$(BINDIR)" VERSION="${PV}" } src_install() { |