Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-terms/st: st-0.3.ebuild ChangeLog st-9999.ebuild st-0.2.1.ebuild st-0.1.1.ebuild
Date: Sat, 23 Feb 2013 15:12:48
Message-Id: 20130223151243.EF07D2171D@flycatcher.gentoo.org
1 xmw 13/02/23 15:12:43
2
3 Modified: st-0.3.ebuild ChangeLog st-9999.ebuild
4 Removed: st-0.2.1.ebuild st-0.1.1.ebuild
5 Log:
6 Correct X11 paths (thanks Joe M, bug 458796), verbose build.
7
8 (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
9
10 Revision Changes Path
11 1.5 x11-terms/st/st-0.3.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/st/st-0.3.ebuild?rev=1.5&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/st/st-0.3.ebuild?rev=1.5&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/st/st-0.3.ebuild?r1=1.4&r2=1.5
16
17 Index: st-0.3.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.3.ebuild,v
20 retrieving revision 1.4
21 retrieving revision 1.5
22 diff -u -r1.4 -r1.5
23 --- st-0.3.ebuild 22 Feb 2013 16:16:39 -0000 1.4
24 +++ st-0.3.ebuild 23 Feb 2013 15:12:43 -0000 1.5
25 @@ -1,9 +1,10 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.3.ebuild,v 1.4 2013/02/22 16:16:39 xmw Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.3.ebuild,v 1.5 2013/02/23 15:12:43 xmw Exp $
30
31 -EAPI=4
32 -inherit savedconfig toolchain-funcs
33 +EAPI=5
34 +
35 +inherit multilib savedconfig toolchain-funcs
36
37 DESCRIPTION="simple terminal implementation for X"
38 HOMEPAGE="http://st.suckless.org/"
39 @@ -27,14 +28,18 @@
40 sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
41 -e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
42 -e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \
43 + -e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
44 + -e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
45 -i config.mk || die
46 + sed -e '/@echo/!s:@::' \
47 + -i Makefile || die
48 tc-export CC
49
50 restore_config config.h
51 }
52
53 src_install() {
54 - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install || die
55 + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
56 tic -s -o "${ED}"/usr/share/terminfo st.info || die
57 dodoc TODO
58
59
60
61
62 1.11 x11-terms/st/ChangeLog
63
64 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/st/ChangeLog?rev=1.11&view=markup
65 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/st/ChangeLog?rev=1.11&content-type=text/plain
66 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/st/ChangeLog?r1=1.10&r2=1.11
67
68 Index: ChangeLog
69 ===================================================================
70 RCS file: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v
71 retrieving revision 1.10
72 retrieving revision 1.11
73 diff -u -r1.10 -r1.11
74 --- ChangeLog 22 Feb 2013 16:16:39 -0000 1.10
75 +++ ChangeLog 23 Feb 2013 15:12:43 -0000 1.11
76 @@ -1,6 +1,10 @@
77 # ChangeLog for x11-terms/st
78 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
79 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.10 2013/02/22 16:16:39 xmw Exp $
80 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.11 2013/02/23 15:12:43 xmw Exp $
81 +
82 + 23 Feb 2013; Michael Weber <xmw@g.o> -st-0.1.1.ebuild,
83 + -st-0.2.1.ebuild, st-0.3.ebuild, st-9999.ebuild:
84 + Correct X11 paths (thanks Joe M, bug 458796), verbose build.
85
86 22 Feb 2013; Michael Weber <xmw@g.o> st-0.3.ebuild, st-9999.ebuild,
87 metadata.xml:
88
89
90
91 1.8 x11-terms/st/st-9999.ebuild
92
93 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/st/st-9999.ebuild?rev=1.8&view=markup
94 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/st/st-9999.ebuild?rev=1.8&content-type=text/plain
95 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/st/st-9999.ebuild?r1=1.7&r2=1.8
96
97 Index: st-9999.ebuild
98 ===================================================================
99 RCS file: /var/cvsroot/gentoo-x86/x11-terms/st/st-9999.ebuild,v
100 retrieving revision 1.7
101 retrieving revision 1.8
102 diff -u -r1.7 -r1.8
103 --- st-9999.ebuild 22 Feb 2013 16:16:39 -0000 1.7
104 +++ st-9999.ebuild 23 Feb 2013 15:12:43 -0000 1.8
105 @@ -1,10 +1,10 @@
106 # Copyright 1999-2013 Gentoo Foundation
107 # Distributed under the terms of the GNU General Public License v2
108 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-9999.ebuild,v 1.7 2013/02/22 16:16:39 xmw Exp $
109 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-9999.ebuild,v 1.8 2013/02/23 15:12:43 xmw Exp $
110
111 EAPI=5
112
113 -inherit git-2 savedconfig toolchain-funcs
114 +inherit multilib savedconfig toolchain-funcs
115
116 DESCRIPTION="simple terminal implementation for X"
117 HOMEPAGE="http://st.suckless.org/"
118 @@ -15,8 +15,7 @@
119 KEYWORDS=""
120 IUSE="savedconfig"
121
122 -RDEPEND="
123 - media-libs/fontconfig
124 +RDEPEND="media-libs/fontconfig
125 x11-libs/libX11
126 x11-libs/libXext
127 x11-libs/libXft"
128 @@ -27,14 +26,18 @@
129 sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
130 -e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
131 -e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \
132 + -e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
133 + -e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
134 -i config.mk || die
135 + sed -e '/@echo/!s:@::' \
136 + -i Makefile || die
137 tc-export CC
138
139 restore_config config.h
140 }
141
142 src_install() {
143 - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install || die
144 + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
145 tic -s -o "${ED}"/usr/share/terminfo st.info || die
146 dodoc TODO
Report Message
Find on MARC Find on Google Groups