1 |
lack 08/11/05 18:18:10 |
2 |
|
3 |
Modified: ChangeLog metadata.xml |
4 |
Added: gkrellm-2.3.2.ebuild |
5 |
Removed: gkrellm-2.2.5.ebuild gkrellm-2.2.10.ebuild |
6 |
gkrellm-2.3.0.ebuild gkrellm-2.2.9-r1.ebuild |
7 |
Log: |
8 |
Version cleanup, and version bump. Should address bug 224571 and bug 240052 |
9 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686) |
10 |
|
11 |
Revision Changes Path |
12 |
1.161 app-admin/gkrellm/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/ChangeLog?rev=1.161&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/ChangeLog?rev=1.161&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/ChangeLog?r1=1.160&r2=1.161 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v |
21 |
retrieving revision 1.160 |
22 |
retrieving revision 1.161 |
23 |
diff -u -r1.160 -r1.161 |
24 |
--- ChangeLog 27 Sep 2008 16:29:07 -0000 1.160 |
25 |
+++ ChangeLog 5 Nov 2008 18:18:10 -0000 1.161 |
26 |
@@ -1,6 +1,17 @@ |
27 |
# ChangeLog for app-admin/gkrellm |
28 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.160 2008/09/27 16:29:07 armin76 Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.161 2008/11/05 18:18:10 lack Exp $ |
31 |
+ |
32 |
+*gkrellm-2.3.2 (05 Nov 2008) |
33 |
+ |
34 |
+ 05 Nov 2008; Jim Ramsay <lack@g.o> |
35 |
+ -files/gkrellm-2.2.9-build.patch, -files/gkrellm-2.2.9-gnutls.patch, |
36 |
+ -files/gkrellm-2.2.10-Makefile.patch, -files/gkrellm-mbmon-amd64.patch, |
37 |
+ -files/gkrellm-2.2.10-build.patch, -files/gkrellm-2.2.10-gnutls.patch, |
38 |
+ metadata.xml, -gkrellm-2.2.5.ebuild, -gkrellm-2.2.9-r1.ebuild, |
39 |
+ -gkrellm-2.2.10.ebuild, -gkrellm-2.3.0.ebuild, +gkrellm-2.3.2.ebuild: |
40 |
+ Version cleanup, and version bump. Should address bug 224571 and bug |
41 |
+ 240052. |
42 |
|
43 |
27 Sep 2008; Raúl Porcel <armin76@g.o> gkrellm-2.3.1.ebuild: |
44 |
arm stable wrt #231166 |
45 |
|
46 |
|
47 |
|
48 |
1.4 app-admin/gkrellm/metadata.xml |
49 |
|
50 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/metadata.xml?rev=1.4&view=markup |
51 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/metadata.xml?rev=1.4&content-type=text/plain |
52 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/metadata.xml?r1=1.3&r2=1.4 |
53 |
|
54 |
Index: metadata.xml |
55 |
=================================================================== |
56 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/gkrellm/metadata.xml,v |
57 |
retrieving revision 1.3 |
58 |
retrieving revision 1.4 |
59 |
diff -u -r1.3 -r1.4 |
60 |
--- metadata.xml 22 Feb 2007 21:47:23 -0000 1.3 |
61 |
+++ metadata.xml 5 Nov 2008 18:18:10 -0000 1.4 |
62 |
@@ -6,4 +6,18 @@ |
63 |
<email>lack@g.o</email> |
64 |
<name>Jim Ramsay</name> |
65 |
</maintainer> |
66 |
+ <use> |
67 |
+ <flag name="hddtemp">Enable monitoring harddrive temperatures via |
68 |
+ <pkg>app-admin/hddtemp</pkg></flag> |
69 |
+ <flag name="gnutls">Enable SSL support for mail checking with |
70 |
+ <pkg>net-libs/gnutls</pkg> (overrides 'ssl' USE flag)</flag> |
71 |
+ <flag name="ssl">Enable SSL support for mail checking with |
72 |
+ <pkg>dev-libs/openssl</pkg></flag> |
73 |
+ <flag name="lm_sensors">Enable monitoring sensors via |
74 |
+ <pkg>sys-apps/lm_sensors</pkg></flag> |
75 |
+ <flag name="X">Build both the X11 gui (gkrellm) and the server |
76 |
+ (gkrellmd). Disabling this flag builds the server only.</flag> |
77 |
+ <flag name="ntlm">Enable NTLM authentication for mail checking with |
78 |
+ <pkg>net-libs/libntlm</pkg></flag> |
79 |
+ </use> |
80 |
</pkgmetadata> |
81 |
|
82 |
|
83 |
|
84 |
1.1 app-admin/gkrellm/gkrellm-2.3.2.ebuild |
85 |
|
86 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2.ebuild?rev=1.1&view=markup |
87 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2.ebuild?rev=1.1&content-type=text/plain |
88 |
|
89 |
Index: gkrellm-2.3.2.ebuild |
90 |
=================================================================== |
91 |
# Copyright 1999-2008 Gentoo Foundation |
92 |
# Distributed under the terms of the GNU General Public License v2 |
93 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2.ebuild,v 1.1 2008/11/05 18:18:10 lack Exp $ |
94 |
|
95 |
EAPI=2 |
96 |
|
97 |
inherit eutils multilib toolchain-funcs |
98 |
|
99 |
DESCRIPTION="Single process stack of various system monitors" |
100 |
HOMEPAGE="http://www.gkrellm.net/" |
101 |
SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2" |
102 |
|
103 |
LICENSE="GPL-3" |
104 |
SLOT="2" |
105 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
106 |
IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD" |
107 |
|
108 |
RDEPEND=">=dev-libs/glib-2 |
109 |
hddtemp? ( app-admin/hddtemp ) |
110 |
gnutls? ( net-libs/gnutls ) |
111 |
!gnutls? ( ssl? ( dev-libs/openssl ) ) |
112 |
lm_sensors? ( sys-apps/lm_sensors ) |
113 |
nls? ( virtual/libintl ) |
114 |
ntlm? ( net-libs/libntlm ) |
115 |
X? ( >=x11-libs/gtk+-2 )" |
116 |
DEPEND="${RDEPEND} |
117 |
dev-util/pkgconfig |
118 |
nls? ( sys-devel/gettext )" |
119 |
|
120 |
pkg_setup() { |
121 |
enewgroup gkrellmd |
122 |
enewuser gkrellmd -1 -1 -1 gkrellmd |
123 |
TARGET= |
124 |
use kernel_FreeBSD && TARGET="freebsd" |
125 |
} |
126 |
|
127 |
src_prepare() { |
128 |
sed -e 's:-O2 ::' \ |
129 |
-e 's:override CC:CFLAGS:' \ |
130 |
-i */Makefile || die "sed Makefile(s) failed" |
131 |
|
132 |
sed -e 's:#user\tnobody:user\tgkrellmd:' \ |
133 |
-e 's:#group\tproc:group\tgkrellmd:' \ |
134 |
-i server/gkrellmd.conf || die "sed gkrellmd.conf failed" |
135 |
|
136 |
sed -e "s:/usr/lib:/usr/$(get_libdir):" \ |
137 |
-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \ |
138 |
-i src/${PN}.h || die "sed ${PN}.h failed" |
139 |
} |
140 |
|
141 |
src_compile() { |
142 |
if use X ; then |
143 |
local sslopt="" |
144 |
if use gnutls; then |
145 |
sslopt="without-ssl=yes" |
146 |
elif use ssl; then |
147 |
sslopt="without-gnutls=yes" |
148 |
else |
149 |
sslopt="without-ssl=yes without-gnutls=yes" |
150 |
fi |
151 |
|
152 |
emake ${TARGET} \ |
153 |
CC="$(tc-getCC)" \ |
154 |
LINK_FLAGS="$LDFLAGS -Wl,-E" \ |
155 |
STRIP="" \ |
156 |
INSTALLROOT="/usr" \ |
157 |
INCLUDEDIR="/usr/include/gkrellm2" \ |
158 |
LOCALEDIR="/usr/share/locale" \ |
159 |
$(use nls || echo enable_nls=0) \ |
160 |
$(use lm_sensors || echo without-libsensors=yes) \ |
161 |
${sslopt} \ |
162 |
|| die "emake failed" |
163 |
else |
164 |
cd server |
165 |
emake ${TARGET} \ |
166 |
CC="$(tc-getCC)" \ |
167 |
LINK_FLAGS="$LDFLAGS -Wl,-E" \ |
168 |
STRIP="" \ |
169 |
$(use lm_sensors || echo without-libsensors=yes) \ |
170 |
|| die "emake failed" |
171 |
fi |
172 |
} |
173 |
|
174 |
src_install() { |
175 |
if use X ; then |
176 |
emake install${TARGET:+_}${TARGET} \ |
177 |
$(use nls || echo enable_nls=0) \ |
178 |
STRIP="" \ |
179 |
INSTALLDIR="${D}/usr/bin" \ |
180 |
INCLUDEDIR="${D}/usr/include" \ |
181 |
LOCALEDIR="${D}/usr/share/locale" \ |
182 |
PKGCONFIGDIR="${D}/usr/$(get_libdir)/pkgconfig" \ |
183 |
MANDIR="${D}/usr/share/man/man1" \ |
184 |
|| die "emake install failed" |
185 |
|
186 |
dohtml *.html |
187 |
|
188 |
newicon src/icon.xpm ${PN}.xpm |
189 |
make_desktop_entry ${PN} GKrellM ${PN} |
190 |
else |
191 |
dobin server/gkrellmd || die "dobin failed" |
192 |
|
193 |
insinto /usr/include/gkrellm2 |
194 |
doins server/gkrellmd.h || die "doins failed" |
195 |
fi |
196 |
|
197 |
doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed" |
198 |
doconfd "${FILESDIR}"/gkrellmd.conf || die "doconfd failed" |
199 |
|
200 |
insinto /etc |
201 |
doins server/gkrellmd.conf || die "doins failed" |
202 |
|
203 |
dodoc Changelog CREDITS README |
204 |
} |
205 |
|
206 |
pkg_postinst() { |
207 |
if use X ; then |
208 |
ewarn "The old executable name 'gkrellm2' has been removed." |
209 |
ewarn "Run 'gkrellm' instead." |
210 |
fi |
211 |
} |