From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QysHy-0001P2-63 for garchives@archives.gentoo.org; Wed, 31 Aug 2011 21:25:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B754921C0F9; Wed, 31 Aug 2011 21:25:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7400121C0F9 for ; Wed, 31 Aug 2011 21:25:30 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BFDED1B400B for ; Wed, 31 Aug 2011 21:25:29 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 943) id 7C8162004C; Wed, 31 Aug 2011 21:25:28 +0000 (UTC) From: "Joe Sapp (nixphoeni)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, nixphoeni@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-sound/xwax: ChangeLog xwax-1.0.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog xwax-1.0.ebuild X-VCS-Directories: media-sound/xwax X-VCS-Committer: nixphoeni X-VCS-Committer-Name: Joe Sapp Content-Type: text/plain; charset=utf8 Message-Id: <20110831212528.7C8162004C@flycatcher.gentoo.org> Date: Wed, 31 Aug 2011 21:25:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 94c355525f894469bccf68acf1559b6d nixphoeni 11/08/31 21:25:28 Modified: ChangeLog xwax-1.0.ebuild Log: Addressed the inadvertent use of git during compile =20 (Portage version: 2.1.10.11/cvs/Linux x86_64) Revision Changes Path 1.35 media-sound/xwax/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/C= hangeLog?rev=3D1.35&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/C= hangeLog?rev=3D1.35&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/C= hangeLog?r1=3D1.34&r2=3D1.35 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- ChangeLog 4 Aug 2011 02:43:12 -0000 1.34 +++ ChangeLog 31 Aug 2011 21:25:28 -0000 1.35 @@ -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 201= 1/08/04 02:43:12 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xwax/ChangeLog,v 1.35 201= 1/08/31 21:25:28 nixphoeni Exp $ + + 31 Aug 2011; Joe Sapp xwax-1.0.ebuild: + Compressed sed in src_prepare() and use it to really eliminate the dep= endency + on git. Combined with passing VERSION to emake, this sets the right ve= rsion + without git. =20 *xwax-1.0 (04 Aug 2011) =20 1.2 media-sound/xwax/xwax-1.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/x= wax-1.0.ebuild?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/x= wax-1.0.ebuild?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/xwax/x= wax-1.0.ebuild?r1=3D1.1&r2=3D1.2 Index: xwax-1.0.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-sound/xwax/xwax-1.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xwax-1.0.ebuild 4 Aug 2011 02:43:12 -0000 1.1 +++ xwax-1.0.ebuild 31 Aug 2011 21:25:28 -0000 1.2 @@ -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 $ =20 EAPI=3D4 inherit toolchain-funcs @@ -16,7 +16,8 @@ REQUIRED_USE=3D"|| ( cdda mp3 fallback ) || ( alsa jack oss )" =20 -RDEPEND=3D"media-libs/libsdl +RDEPEND=3D"sys-libs/glibc + media-libs/libsdl media-libs/sdl-ttf media-fonts/dejavu alsa? ( media-libs/alsa-lib ) @@ -31,10 +32,10 @@ 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 =3D\).*:\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" =20 # Replace any decoder commands in the import script, if necessary @@ -66,7 +67,7 @@ src_compile() { # EXECDIR is the default directory in which xwax will look for # the 'xwax-import' and 'xwax-scan' scripts - emake EXECDIR=3D"${EROOT}usr/bin" + emake EXECDIR=3D"\$(BINDIR)" VERSION=3D"${PV}" } =20 src_install() {