Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/files/, app-admin/gkrellm/
Date: Sat, 04 Jun 2016 16:11:43
Message-Id: 1465056687.6cd8f758eb5dbd4b1d47fc4564cd402f4a11db52.polynomial-c@gentoo
1 commit: 6cd8f758eb5dbd4b1d47fc4564cd402f4a11db52
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 4 16:05:52 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 4 16:11:27 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd8f758
7
8 app-admin/gkrellm: Bump to version 2.3.7
9
10 Package-Manager: portage-2.2.28
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 app-admin/gkrellm/Manifest | 1 +
14 .../gkrellm-2.3.7-pkgconfig_fix_newlines.patch | 11 ++
15 app-admin/gkrellm/gkrellm-2.3.7.ebuild | 145 +++++++++++++++++++++
16 3 files changed, 157 insertions(+)
17
18 diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
19 index 33dcea7..1795513 100644
20 --- a/app-admin/gkrellm/Manifest
21 +++ b/app-admin/gkrellm/Manifest
22 @@ -1,3 +1,4 @@
23 DIST gkrellm-2.3.5.tar.bz2 765011 SHA256 702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b SHA512 9681ec5978b6be9f56a71726df36671829a4427f45caf90c8c3460e8c59004ff4083de1692cad16e3724ed37418bb3e4589d1961c140f3becfa3efd210b7a5dc WHIRLPOOL 3dceb20b9da49fb9b287e1faca88b3fdb7ae7af6dde5e675ee1e5c718467b131e34f740cb38719e5026ce0478146264fa4eaa060120e71f2c442ec5504e6dfb4
24 DIST gkrellm-2.3.6-rc1.tar.bz2 784934 SHA256 abeeb0c04a8f911db5f07a95a98e4044326a657f65986013d36a736ba4e47ae8 SHA512 2004c6e57dc5dba9dbbd4c713caa29f5b59e4926b1ce4a3cfb47840096d6d93d66633d15d5588bc22e31df88241248d7910645da75de39278f1fd68255b88517 WHIRLPOOL f3506e88dc19e3eebe313b5f57a5d605d6b011808391036ff5332140c53061f8ee99b942b2b287cb7f645e9f2491e654623759b4a01fa454c785883355141319
25 DIST gkrellm-2.3.6_rc1-update_german_translation.patch.xz 18184 SHA256 cb90522c99135736ac3073b7e688fbcb0da31f6594ce3fc851df87c9be10f2df SHA512 c79feb4b740b303e5e6e2ccf84694770bac746b375a0a09918ef1ac67b2700f3a7796251cd4224958ca50a8f81a501bf468dc7a78844218074130758a8248150 WHIRLPOOL ea3d532aa670b7344cc2dd6c5fd4dda6ec27832c039547ace0772b4a3002baaeb598003d81bf2231b2506de1e22d2b83959e4f1bc7ec13b56b2366c43101ace0
26 +DIST gkrellm-2.3.7.tar.bz2 777841 SHA256 f7a4642d2cc6b61242215e58e1bd8fe394e6fd984cd3c3f8964c1c554029735d SHA512 832353d245966a5d64ccbacd619905fe437b347c2654e279ec47b56aa1ef559a166b4791d63e151a5481c55c1d3775906e52213f42e5d7071fd15f00f8cecaa5 WHIRLPOOL 3fd8b51a1be5174308fe1dbbb1c1d83df0685c12e71cf410533f97439fb5cf001553c462e15b9971c55c6ea87b28429136fe0025d39c443cb9d215fcf7620f46
27
28 diff --git a/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch b/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
29 new file mode 100644
30 index 0000000..a699b80
31 --- /dev/null
32 +++ b/app-admin/gkrellm/files/gkrellm-2.3.7-pkgconfig_fix_newlines.patch
33 @@ -0,0 +1,11 @@
34 +--- gkrellm-2.3.7/Makefile
35 ++++ gkrellm-2.3.7/Makefile
36 +@@ -131,7 +131,7 @@
37 + (cd server && ${MAKE} gkrellmd)
38 +
39 + gkrellm.pc: Makefile
40 +- echo 'prefix=$(INSTALLROOT)\n'\
41 ++ printf 'prefix=$(INSTALLROOT)\n'\
42 + 'Name: GKrellM\n'\
43 + 'Description: Extensible GTK system monitoring application\n'\
44 + 'Version: $(VERSION)\n'\
45
46 diff --git a/app-admin/gkrellm/gkrellm-2.3.7.ebuild b/app-admin/gkrellm/gkrellm-2.3.7.ebuild
47 new file mode 100644
48 index 0000000..49eca4b
49 --- /dev/null
50 +++ b/app-admin/gkrellm/gkrellm-2.3.7.ebuild
51 @@ -0,0 +1,145 @@
52 +# Copyright 1999-2016 Gentoo Foundation
53 +# Distributed under the terms of the GNU General Public License v2
54 +# $Id$
55 +
56 +EAPI=6
57 +
58 +inherit eutils multilib user systemd toolchain-funcs
59 +
60 +MY_P="${P/_/-}"
61 +
62 +DESCRIPTION="Single process stack of various system monitors"
63 +HOMEPAGE="http://www.gkrellm.net/"
64 +SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
65 +
66 +LICENSE="GPL-3"
67 +SLOT="2"
68 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
69 +IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
70 +
71 +RDEPEND="
72 + dev-libs/glib:2
73 + hddtemp? ( app-admin/hddtemp )
74 + gnutls? ( net-libs/gnutls )
75 + !gnutls? (
76 + ssl? (
77 + !libressl? ( dev-libs/openssl:0= )
78 + libressl? ( dev-libs/libressl:0= )
79 + )
80 + )
81 + lm_sensors? ( sys-apps/lm_sensors )
82 + nls? ( virtual/libintl )
83 + ntlm? ( net-libs/libntlm )
84 + X? (
85 + x11-libs/gdk-pixbuf
86 + x11-libs/gtk+:2
87 + x11-libs/libICE
88 + x11-libs/libSM
89 + x11-libs/libX11
90 + x11-libs/pango
91 + )"
92 +DEPEND="${RDEPEND}
93 + virtual/pkgconfig
94 + nls? ( sys-devel/gettext )"
95 +
96 +PATCHES=(
97 + "${FILESDIR}"/${PN}-2.3.5-cifs.patch
98 + "${FILESDIR}"/${PN}-2.3.5-config.patch
99 + "${FILESDIR}"/${PN}-2.3.5-width.patch
100 + "${FILESDIR}"/${PN}-2.3.5-sansfont.patch
101 + "${FILESDIR}"/${P}-pkgconfig_fix_newlines.patch
102 +)
103 +
104 +S="${WORKDIR}/${MY_P}"
105 +
106 +DOCS=( Changelog CREDITS README )
107 +
108 +pkg_setup() {
109 + enewgroup gkrellmd
110 + enewuser gkrellmd -1 -1 -1 gkrellmd
111 + TARGET=
112 + use kernel_FreeBSD && TARGET="freebsd"
113 +}
114 +
115 +src_prepare() {
116 + sed -e 's:-O2 ::' \
117 + -e 's:override CC:CFLAGS:' \
118 + -e 's:-L/usr/X11R6/lib::' \
119 + -i */Makefile || die "sed Makefile(s) failed"
120 +
121 + sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
122 + -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
123 + -i src/${PN}.h || die "sed ${PN}.h failed"
124 +
125 + default
126 +}
127 +
128 +src_compile() {
129 + if use X ; then
130 + local sslopt=""
131 + if use gnutls; then
132 + sslopt="without-ssl=yes"
133 + elif use ssl; then
134 + sslopt="without-gnutls=yes"
135 + else
136 + sslopt="without-ssl=yes without-gnutls=yes"
137 + fi
138 +
139 + emake \
140 + ${TARGET} \
141 + CC="$(tc-getCC)" \
142 + STRIP="" \
143 + INSTALLROOT="${EPREFIX}/usr" \
144 + INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
145 + LOCALEDIR="${EPREFIX}/usr/share/locale" \
146 + $(usex nls "" "enable_nls=0") \
147 + $(usex lm_sensors "" "without-libsensors=yes") \
148 + $(usex ntlm "" "without-ntlm=yes") \
149 + ${sslopt}
150 + else
151 + cd server || die
152 + emake \
153 + ${TARGET} \
154 + CC="$(tc-getCC)" \
155 + LINK_FLAGS="$LDFLAGS -Wl,-E" \
156 + STRIP="" \
157 + $(usex nls "" "enable_nls=0") \
158 + $(usex lm_sensors "" "without-libsensors=yes")
159 + fi
160 +}
161 +
162 +src_install() {
163 + if use X ; then
164 + emake \
165 + install${TARGET:+_}${TARGET} \
166 + $(usex nls "" "enable_nls=0") \
167 + STRIP="" \
168 + INSTALLDIR="${ED}/usr/bin" \
169 + INCLUDEDIR="${ED}/usr/include" \
170 + LOCALEDIR="${ED}/usr/share/locale" \
171 + PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
172 + MANDIR="${ED}/usr/share/man/man1"
173 +
174 + docinto html
175 + dodoc *.html
176 +
177 + newicon src/icon.xpm ${PN}.xpm
178 + make_desktop_entry ${PN} GKrellM ${PN}
179 + else
180 + dobin server/gkrellmd
181 +
182 + insinto /usr/include/gkrellm2
183 + doins server/gkrellmd.h
184 + doins shared/log.h
185 + fi
186 +
187 + newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
188 + newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
189 +
190 + systemd_dounit "${FILESDIR}"/gkrellmd.service
191 +
192 + insinto /etc
193 + doins server/gkrellmd.conf
194 +
195 + einstalldocs
196 +}