jer 14/09/03 10:50:04 Modified: dzen-0.9.5-r1.ebuild ChangeLog Removed: dzen-0.8.5.ebuild Log: Replace some sed scripts with a patch. Do not inject pkg-config output directly. Ensure USE flags match build configuration (bug #521776). (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.4 x11-misc/dzen/dzen-0.9.5-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/dzen-0.9.5-r1.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/dzen-0.9.5-r1.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/dzen-0.9.5-r1.ebuild?r1=1.3&r2=1.4 Index: dzen-0.9.5-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-misc/dzen/dzen-0.9.5-r1.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dzen-0.9.5-r1.ebuild 30 Sep 2013 17:18:04 -0000 1.3 +++ dzen-0.9.5-r1.ebuild 3 Sep 2014 10:50:04 -0000 1.4 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/dzen-0.9.5-r1.ebuild,v 1.3 2013/09/30 17:18:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/dzen-0.9.5-r1.ebuild,v 1.4 2014/09/03 10:50:04 jer Exp $ EAPI=5 inherit eutils toolchain-funcs vcs-snapshot @@ -32,42 +32,35 @@ DOCS=( README ) src_prepare() { - epatch "${FILESDIR}"/${P}-off-by-one.patch - - sed -i \ - -e "s:-L/usr/lib::g" \ - -e '/^CC.*/d' \ - -e 's:-Os::g' \ - -e 's:/usr/local:/usr:g' \ - -e 's:CFLAGS =:CFLAGS +=:g' \ - -e 's:^LDFLAGS =:LDFLAGS +=:' \ - config.mk gadgets/config.mk || die + epatch \ + "${FILESDIR}"/${P}-config-default.patch \ + "${FILESDIR}"/${P}-off-by-one.patch sed -i \ -e '/strip/d' \ -e 's:^ @: :g' \ - Makefile gadgets/Makefile \ - || die + -e 's:{CC}:(CC):g' \ + Makefile gadgets/Makefile || die + + tc-export CC PKG_CONFIG } src_configure() { if use xinerama ; then - sed -e "/^LIBS/s/$/\ -lXinerama/" \ - -e "/^CFLAGS/s/$/\ -DDZEN_XINERAMA/" \ + sed -e '/^LIBS/s|$| -lXinerama|' \ + -e '/^CFLAGS/s|$| -DDZEN_XINERAMA|' \ -i config.mk || die fi if use xpm ; then - sed -e "/^LIBS/s/$/\ -lXpm/" \ - -e "/^CFLAGS/s/$/\ -DDZEN_XPM/" \ + sed -e '/^LIBS/s|$| -lXpm|' \ + -e '/^CFLAGS/s|$| -DDZEN_XPM|' \ -i config.mk || die fi if use xft ; then - sed -e "/^LIBS/s/$/\ \`pkg-config --libs xft\`/" \ - -e "/^CFLAGS/s/$/\ -DDZEN_XFT \`pkg-config --cflags xft\`/" \ + sed -e '/^LIBS/s|$| $(shell ${PKG_CONFIG} --libs xft)|' \ + -e '/^CFLAGS/s|$| -DDZEN_XFT $(shell ${PKG_CONFIG} --cflags xft)|' \ -i config.mk || die fi - - tc-export CC } src_compile() { 1.16 x11-misc/dzen/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/ChangeLog?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/ChangeLog?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/ChangeLog?r1=1.15&r2=1.16 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ChangeLog 30 Sep 2013 17:18:04 -0000 1.15 +++ ChangeLog 3 Sep 2014 10:50:04 -0000 1.16 @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/dzen -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v 1.15 2013/09/30 17:18:04 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v 1.16 2014/09/03 10:50:04 jer Exp $ + + 03 Sep 2014; Jeroen Roovers <j...@gentoo.org> -dzen-0.8.5.ebuild, + dzen-0.9.5-r1.ebuild, +files/dzen-0.9.5-config-default.patch: + Replace some sed scripts with a patch. Do not inject pkg-config output + directly. Ensure USE flags match build configuration (bug #521776). 30 Sep 2013; Agostino Sarubbo <a...@gentoo.org> dzen-0.9.5-r1.ebuild: Stable for x86, wrt bug #485738
