| 1 |
jer 14/09/03 10:50:04 |
| 2 |
|
| 3 |
Modified: dzen-0.9.5-r1.ebuild ChangeLog |
| 4 |
Removed: dzen-0.8.5.ebuild |
| 5 |
Log: |
| 6 |
Replace some sed scripts with a patch. Do not inject pkg-config output directly. Ensure USE flags match build configuration (bug #521776). |
| 7 |
|
| 8 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 x11-misc/dzen/dzen-0.9.5-r1.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/dzen-0.9.5-r1.ebuild?rev=1.4&view=markup |
| 14 |
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 |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/dzen-0.9.5-r1.ebuild?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: dzen-0.9.5-r1.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/dzen/dzen-0.9.5-r1.ebuild,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- dzen-0.9.5-r1.ebuild 30 Sep 2013 17:18:04 -0000 1.3 |
| 24 |
+++ dzen-0.9.5-r1.ebuild 3 Sep 2014 10:50:04 -0000 1.4 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
-# Copyright 1999-2013 Gentoo Foundation |
| 27 |
+# Copyright 1999-2014 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $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 $ |
| 30 |
+# $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 $ |
| 31 |
|
| 32 |
EAPI=5 |
| 33 |
inherit eutils toolchain-funcs vcs-snapshot |
| 34 |
@@ -32,42 +32,35 @@ |
| 35 |
DOCS=( README ) |
| 36 |
|
| 37 |
src_prepare() { |
| 38 |
- epatch "${FILESDIR}"/${P}-off-by-one.patch |
| 39 |
- |
| 40 |
- sed -i \ |
| 41 |
- -e "s:-L/usr/lib::g" \ |
| 42 |
- -e '/^CC.*/d' \ |
| 43 |
- -e 's:-Os::g' \ |
| 44 |
- -e 's:/usr/local:/usr:g' \ |
| 45 |
- -e 's:CFLAGS =:CFLAGS +=:g' \ |
| 46 |
- -e 's:^LDFLAGS =:LDFLAGS +=:' \ |
| 47 |
- config.mk gadgets/config.mk || die |
| 48 |
+ epatch \ |
| 49 |
+ "${FILESDIR}"/${P}-config-default.patch \ |
| 50 |
+ "${FILESDIR}"/${P}-off-by-one.patch |
| 51 |
|
| 52 |
sed -i \ |
| 53 |
-e '/strip/d' \ |
| 54 |
-e 's:^ @: :g' \ |
| 55 |
- Makefile gadgets/Makefile \ |
| 56 |
- || die |
| 57 |
+ -e 's:{CC}:(CC):g' \ |
| 58 |
+ Makefile gadgets/Makefile || die |
| 59 |
+ |
| 60 |
+ tc-export CC PKG_CONFIG |
| 61 |
} |
| 62 |
|
| 63 |
src_configure() { |
| 64 |
if use xinerama ; then |
| 65 |
- sed -e "/^LIBS/s/$/\ -lXinerama/" \ |
| 66 |
- -e "/^CFLAGS/s/$/\ -DDZEN_XINERAMA/" \ |
| 67 |
+ sed -e '/^LIBS/s|$| -lXinerama|' \ |
| 68 |
+ -e '/^CFLAGS/s|$| -DDZEN_XINERAMA|' \ |
| 69 |
-i config.mk || die |
| 70 |
fi |
| 71 |
if use xpm ; then |
| 72 |
- sed -e "/^LIBS/s/$/\ -lXpm/" \ |
| 73 |
- -e "/^CFLAGS/s/$/\ -DDZEN_XPM/" \ |
| 74 |
+ sed -e '/^LIBS/s|$| -lXpm|' \ |
| 75 |
+ -e '/^CFLAGS/s|$| -DDZEN_XPM|' \ |
| 76 |
-i config.mk || die |
| 77 |
fi |
| 78 |
if use xft ; then |
| 79 |
- sed -e "/^LIBS/s/$/\ \`pkg-config --libs xft\`/" \ |
| 80 |
- -e "/^CFLAGS/s/$/\ -DDZEN_XFT \`pkg-config --cflags xft\`/" \ |
| 81 |
+ sed -e '/^LIBS/s|$| $(shell ${PKG_CONFIG} --libs xft)|' \ |
| 82 |
+ -e '/^CFLAGS/s|$| -DDZEN_XFT $(shell ${PKG_CONFIG} --cflags xft)|' \ |
| 83 |
-i config.mk || die |
| 84 |
fi |
| 85 |
- |
| 86 |
- tc-export CC |
| 87 |
} |
| 88 |
|
| 89 |
src_compile() { |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.16 x11-misc/dzen/ChangeLog |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/ChangeLog?rev=1.16&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/ChangeLog?rev=1.16&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/ChangeLog?r1=1.15&r2=1.16 |
| 98 |
|
| 99 |
Index: ChangeLog |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v |
| 102 |
retrieving revision 1.15 |
| 103 |
retrieving revision 1.16 |
| 104 |
diff -u -r1.15 -r1.16 |
| 105 |
--- ChangeLog 30 Sep 2013 17:18:04 -0000 1.15 |
| 106 |
+++ ChangeLog 3 Sep 2014 10:50:04 -0000 1.16 |
| 107 |
@@ -1,6 +1,11 @@ |
| 108 |
# ChangeLog for x11-misc/dzen |
| 109 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v 1.15 2013/09/30 17:18:04 ago Exp $ |
| 111 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 112 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dzen/ChangeLog,v 1.16 2014/09/03 10:50:04 jer Exp $ |
| 113 |
+ |
| 114 |
+ 03 Sep 2014; Jeroen Roovers <jer@g.o> -dzen-0.8.5.ebuild, |
| 115 |
+ dzen-0.9.5-r1.ebuild, +files/dzen-0.9.5-config-default.patch: |
| 116 |
+ Replace some sed scripts with a patch. Do not inject pkg-config output |
| 117 |
+ directly. Ensure USE flags match build configuration (bug #521776). |
| 118 |
|
| 119 |
30 Sep 2013; Agostino Sarubbo <ago@g.o> dzen-0.9.5-r1.ebuild: |
| 120 |
Stable for x86, wrt bug #485738 |
Archives