| 1 |
nixphoeni 11/08/31 21:25:28 |
| 2 |
|
| 3 |
Modified: ChangeLog xwax-1.0.ebuild |
| 4 |
Log: |
| 5 |
Addressed the inadvertent use of git during compile |
| 6 |
|
| 7 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.35 media-sound/xwax/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/ChangeLog?rev=1.35&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/ChangeLog?rev=1.35&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/ChangeLog?r1=1.34&r2=1.35 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v |
| 19 |
retrieving revision 1.34 |
| 20 |
retrieving revision 1.35 |
| 21 |
diff -u -r1.34 -r1.35 |
| 22 |
--- ChangeLog 4 Aug 2011 02:43:12 -0000 1.34 |
| 23 |
+++ ChangeLog 31 Aug 2011 21:25:28 -0000 1.35 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for media-sound/xwax |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.34 2011/08/04 02:43:12 nixphoeni Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.35 2011/08/31 21:25:28 nixphoeni Exp $ |
| 29 |
+ |
| 30 |
+ 31 Aug 2011; Joe Sapp <nixphoeni@g.o> xwax-1.0.ebuild: |
| 31 |
+ Compressed sed in src_prepare() and use it to really eliminate the dependency |
| 32 |
+ on git. Combined with passing VERSION to emake, this sets the right version |
| 33 |
+ without git. |
| 34 |
|
| 35 |
*xwax-1.0 (04 Aug 2011) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 media-sound/xwax/xwax-1.0.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/xwax-1.0.ebuild?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/xwax-1.0.ebuild?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/xwax-1.0.ebuild?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: xwax-1.0.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.0.ebuild,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- xwax-1.0.ebuild 4 Aug 2011 02:43:12 -0000 1.1 |
| 53 |
+++ xwax-1.0.ebuild 31 Aug 2011 21:25:28 -0000 1.2 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.0.ebuild,v 1.1 2011/08/04 02:43:12 nixphoeni Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.0.ebuild,v 1.2 2011/08/31 21:25:28 nixphoeni Exp $ |
| 59 |
|
| 60 |
EAPI=4 |
| 61 |
inherit toolchain-funcs |
| 62 |
@@ -16,7 +16,8 @@ |
| 63 |
REQUIRED_USE="|| ( cdda mp3 fallback ) |
| 64 |
|| ( alsa jack oss )" |
| 65 |
|
| 66 |
-RDEPEND="media-libs/libsdl |
| 67 |
+RDEPEND="sys-libs/glibc |
| 68 |
+ media-libs/libsdl |
| 69 |
media-libs/sdl-ttf |
| 70 |
media-fonts/dejavu |
| 71 |
alsa? ( media-libs/alsa-lib ) |
| 72 |
@@ -31,10 +32,10 @@ |
| 73 |
src_prepare() { |
| 74 |
# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in |
| 75 |
# the Makefile |
| 76 |
- # Also replace VERSION so we don't have to depend on git... |
| 77 |
- sed -i -e 's:\(^CFLAGS.*\)-O[0-9]\(.*\):\1\2:' \ |
| 78 |
- -e 's:\(^LDFLAGS.*\)-O[0-9]\(.*\):\1\2:' \ |
| 79 |
- -e "s:\(^VERSION =\).*:\1 ${PV}:" \ |
| 80 |
+ # Also remove the dependency on the .version target so we don't need |
| 81 |
+ # git just to build |
| 82 |
+ sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \ |
| 83 |
+ -e 's/^xwax\.o:.*\.version//' \ |
| 84 |
Makefile || die "sed failed" |
| 85 |
|
| 86 |
# Replace any decoder commands in the import script, if necessary |
| 87 |
@@ -66,7 +67,7 @@ |
| 88 |
src_compile() { |
| 89 |
# EXECDIR is the default directory in which xwax will look for |
| 90 |
# the 'xwax-import' and 'xwax-scan' scripts |
| 91 |
- emake EXECDIR="${EROOT}usr/bin" |
| 92 |
+ emake EXECDIR="\$(BINDIR)" VERSION="${PV}" |
| 93 |
} |
| 94 |
|
| 95 |
src_install() { |
Archives