* [gentoo-commits] gentoo-x86 commit in app-admin/gkrellm: gkrellm-2.3.5-r3.ebuild metadata.xml ChangeLog
@ 2015-03-24 20:01 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2015-03-24 20:01 UTC (permalink / raw
To: gentoo-commits
jlec 15/03/24 20:01:43
Modified: metadata.xml ChangeLog
Added: gkrellm-2.3.5-r3.ebuild
Log:
Bump to EAPI=5; add missing dependency on x11-libs/pango, #382235; fix for format-security, #520556; import various patches from fedora
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path
1.6 app-admin/gkrellm/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/metadata.xml?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/metadata.xml?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/metadata.xml?r1=1.5&r2=1.6
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/gkrellm/metadata.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- metadata.xml 1 Jun 2013 11:15:08 -0000 1.5
+++ metadata.xml 24 Mar 2015 20:01:43 -0000 1.6
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-dock</herd>
- <use>
- <flag name="hddtemp">Enable monitoring harddrive temperatures via
+ <herd>desktop-dock</herd>
+ <use>
+ <flag name="hddtemp">Enable monitoring harddrive temperatures via
<pkg>app-admin/hddtemp</pkg></flag>
- <flag name="gnutls">Enable SSL support for mail checking with
+ <flag name="gnutls">Enable SSL support for mail checking with
<pkg>net-libs/gnutls</pkg> (overrides 'ssl' USE flag)</flag>
- <flag name="ssl">Enable SSL support for mail checking with
+ <flag name="ssl">Enable SSL support for mail checking with
<pkg>dev-libs/openssl</pkg></flag>
- <flag name="lm_sensors">Enable monitoring sensors via
+ <flag name="lm_sensors">Enable monitoring sensors via
<pkg>sys-apps/lm_sensors</pkg></flag>
- <flag name="X">Build both the X11 gui (gkrellm) and the server
+ <flag name="X">Build both the X11 gui (gkrellm) and the server
(gkrellmd). Disabling this flag builds the server only.</flag>
- <flag name="ntlm">Enable NTLM authentication for mail checking with
+ <flag name="ntlm">Enable NTLM authentication for mail checking with
<pkg>net-libs/libntlm</pkg></flag>
- </use>
+ </use>
</pkgmetadata>
1.205 app-admin/gkrellm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/ChangeLog?rev=1.205&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/ChangeLog?rev=1.205&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/ChangeLog?r1=1.204&r2=1.205
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- ChangeLog 23 Dec 2013 00:43:05 -0000 1.204
+++ ChangeLog 24 Mar 2015 20:01:43 -0000 1.205
@@ -1,6 +1,16 @@
# ChangeLog for app-admin/gkrellm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.204 2013/12/23 00:43:05 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.205 2015/03/24 20:01:43 jlec Exp $
+
+*gkrellm-2.3.5-r3 (24 Mar 2015)
+
+ 24 Mar 2015; Justin Lecher <jlec@gentoo.org>
+ +files/gkrellm-2.3.5-binding.patch, +files/gkrellm-2.3.5-config.patch,
+ +files/gkrellm-2.3.5-format-security.patch,
+ +files/gkrellm-2.3.5-sansfont.patch, +files/gkrellm-2.3.5-width.patch,
+ +gkrellm-2.3.5-r3.ebuild, metadata.xml:
+ Bump to EAPI=5; add missing dependency on x11-libs/pango, #382235; fix for
+ format-security, #520556; import various patches from fedora
23 Dec 2013; Tom Wijsman <TomWij@gentoo.org>
-files/gkrellm-2.3.2-getline-fix.patch:
1.1 app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild?rev=1.1&content-type=text/plain
Index: gkrellm-2.3.5-r3.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild,v 1.1 2015/03/24 20:01:43 jlec Exp $
EAPI=5
inherit eutils multilib user systemd toolchain-funcs
DESCRIPTION="Single process stack of various system monitors"
HOMEPAGE="http://www.gkrellm.net/"
SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="gnutls hddtemp lm_sensors nls ntlm ssl kernel_FreeBSD X"
RDEPEND="
dev-libs/glib:2
x11-libs/pango
hddtemp? ( app-admin/hddtemp )
gnutls? ( net-libs/gnutls )
!gnutls? ( ssl? ( dev-libs/openssl:0= ) )
lm_sensors? ( sys-apps/lm_sensors )
nls? ( virtual/libintl )
ntlm? ( net-libs/libntlm )
X? ( x11-libs/gtk+:2 )"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )"
pkg_setup() {
enewgroup gkrellmd
enewuser gkrellmd -1 -1 -1 gkrellmd
TARGET=
use kernel_FreeBSD && TARGET="freebsd"
}
src_prepare() {
sed -e 's:-O2 ::' \
-e 's:override CC:CFLAGS:' \
-e 's:-L/usr/X11R6/lib::' \
-i */Makefile || die "sed Makefile(s) failed"
sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
-i src/${PN}.h || die "sed ${PN}.h failed"
epatch \
"${FILESDIR}"/${P}-autofs.patch \
"${FILESDIR}"/${P}-cifs.patch \
"${FILESDIR}"/${P}-dso.patch \
"${FILESDIR}"/${P}-format-security.patch \
"${FILESDIR}"/${P}-config.patch \
"${FILESDIR}"/${P}-width.patch \
"${FILESDIR}"/${P}-binding.patch \
"${FILESDIR}"/${P}-sansfont.patch
}
src_compile() {
if use X ; then
local sslopt=""
if use gnutls; then
sslopt="without-ssl=yes"
elif use ssl; then
sslopt="without-gnutls=yes"
else
sslopt="without-ssl=yes without-gnutls=yes"
fi
emake \
${TARGET} \
CC="$(tc-getCC)" \
STRIP="" \
INSTALLROOT="${EPREFIX}/usr" \
INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
LOCALEDIR="${EPREFIX}/usr/share/locale" \
$(usex nls "" "enable_nls=0") \
$(usex lm_sensors "" "without-libsensors=yes") \
$(usex ntlm "" "without-ntlm=yes") \
${sslopt}
else
cd server || die
emake \
${TARGET} \
CC="$(tc-getCC)" \
LINK_FLAGS="$LDFLAGS -Wl,-E" \
STRIP="" \
$(usex nls "" "enable_nls=0") \
$(usex lm_sensors "" "without-libsensors=yes")
fi
}
src_install() {
if use X ; then
emake \
install${TARGET:+_}${TARGET} \
$(usex nls "" "enable_nls=0") \
STRIP="" \
INSTALLDIR="${ED}/usr/bin" \
INCLUDEDIR="${ED}/usr/include" \
LOCALEDIR="${ED}/usr/share/locale" \
PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
MANDIR="${ED}/usr/share/man/man1"
dohtml *.html
newicon src/icon.xpm ${PN}.xpm
make_desktop_entry ${PN} GKrellM ${PN}
else
dobin server/gkrellmd
insinto /usr/include/gkrellm2
doins server/gkrellmd.h
doins shared/log.h
fi
doinitd "${FILESDIR}"/gkrellmd
newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
systemd_dounit "${FILESDIR}"/gkrellmd.service
insinto /etc
doins server/gkrellmd.conf
dodoc Changelog CREDITS README
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-03-24 20:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-24 20:01 [gentoo-commits] gentoo-x86 commit in app-admin/gkrellm: gkrellm-2.3.5-r3.ebuild metadata.xml ChangeLog Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox