Missing include file with USE=-X (Bug #271463)

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

3 files changed, 132 insertions, 2 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 6f8121ed0730..52469c07299e 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.170 2009/05/21 16:11:32 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.171 2009/05/29 13:05:21 lack Exp $
+
+*gkrellm-2.3.2-r1 (29 May 2009)
+
+  29 May 2009; Jim Ramsay <lack@gentoo.org> +gkrellm-2.3.2-r1.ebuild:
+  Missing include file with USE=-X (Bug #271463)
 
   21 May 2009; Jim Ramsay <lack@gentoo.org> -gkrellm-2.3.1.ebuild,
   gkrellm-2.3.2.ebuild, +files/gkrellm-2.3.2-getline-fix.patch,
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 5d291ff5008c..fddbaa759215 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -2,6 +2,7 @@ AUX gkrellm-2.3.2-getline-fix.patch 736 RMD160 2c98c1c9dc427d30d28a06bc29c8da45c
 AUX gkrellmd 637 RMD160 3e1e034dd0de2be7960f121937d71d4fb2695941 SHA1 7009e94493907a376de0519a78a0832ba5030ca8 SHA256 79606289eedcf16fd52f132088bd9ae0bd476bd4ecdb2fcb4703bed1b64bb67c
 AUX gkrellmd.conf 250 RMD160 4bef31a2562432515dfeb0c05acbba66863aa3b9 SHA1 e7374680680bc587c3bd8a8dba57fa619f20db45 SHA256 66ba64c7a3ce2d97ba2feebf3c38e75b278bbbe152c71472e363d720b198b935
 DIST gkrellm-2.3.2.tar.bz2 747697 RMD160 0aacc0d0783cff5bb2fd8c6736553a3ce8874ad9 SHA1 fe94996c4fe084c28bf7a7fbc3f8d4fd64724ac0 SHA256 a102e681cbcc45f8cb225ca0a321b62772106d6f0bb372eaa026b5a2da840873
+EBUILD gkrellm-2.3.2-r1.ebuild 3224 RMD160 1e679165cd9faf59f464f31a2d470a9108470e2a SHA1 20df93a0fe1b2d4a0c495373cf6a481e41fef0dc SHA256 f8adbe6680d04678147fd432f512c4635c05ee09ea217b39384943f300c926d7
 EBUILD gkrellm-2.3.2.ebuild 3170 RMD160 d0ed9960f7db6cf513dc514082423796a7ff9919 SHA1 f0d2ff25f642580ad51ea7769b689accff06be00 SHA256 59b8010e056c8a2d7fa60c9426759df5464352306af82811e52cb37c057c9b98
-MISC ChangeLog 23495 RMD160 b214e02ec7514e2b3e056576b4073328eb5808de SHA1 495e62da6c26a7f353b15f6815dd8781e1d779f5 SHA256 1a6aec4e163589bc71bbca8fe8a78ecb6731193d9a3d6a1f73c0bf93201b148c
+MISC ChangeLog 23648 RMD160 e9245403fa90f9783c54d5fffe548e77e0ebf3ff SHA1 7d80cdfe3a22a40c635af10a5d03002dac296ff8 SHA256 a8e004633a0a5fcaaee644d2267ee09e3650a8dbb3e23764916e932e445b8435
 MISC metadata.xml 940 RMD160 e85c2b39ba9e3d4fcdf2b314e9357b17e9b2aad2 SHA1 989f5eaebb57c3d432c9b1a9ae8cdee0f0729f5a SHA256 000169e157ad6f8af0d7506f288212f54640b849a4229467bccad41e924c6324
diff --git a/app-admin/gkrellm/gkrellm-2.3.2-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..060818d3a76e
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.2-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2-r1.ebuild,v 1.1 2009/05/29 13:05:21 lack Exp $
+
+EAPI=2
+
+inherit eutils multilib 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"
+IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
+
+RDEPEND=">=dev-libs/glib-2
+	hddtemp? ( app-admin/hddtemp )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( dev-libs/openssl ) )
+	lm_sensors? ( sys-apps/lm_sensors )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	X? ( >=x11-libs/gtk+-2 )"
+DEPEND="${RDEPEND}
+	dev-util/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:' \
+		-i */Makefile || die "sed Makefile(s) failed"
+
+	sed -e 's:#user\tnobody:user\tgkrellmd:' \
+		-e 's:#group\tproc:group\tgkrellmd:' \
+		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
+
+	sed -e "s:/usr/lib:/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+
+	epatch "${FILESDIR}/gkrellm-2.3.2-getline-fix.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)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			INSTALLROOT="/usr" \
+			INCLUDEDIR="/usr/include/gkrellm2" \
+			LOCALEDIR="/usr/share/locale" \
+			$(use nls || echo enable_nls=0) \
+			$(use lm_sensors || echo without-libsensors=yes) \
+			${sslopt} \
+		|| die "emake failed"
+	else
+		cd server
+		emake ${TARGET} \
+			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			$(use lm_sensors || echo without-libsensors=yes) \
+		|| die "emake failed"
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake install${TARGET:+_}${TARGET} \
+			$(use nls || echo enable_nls=0) \
+			STRIP="" \
+			INSTALLDIR="${D}/usr/bin" \
+			INCLUDEDIR="${D}/usr/include" \
+			LOCALEDIR="${D}/usr/share/locale" \
+			PKGCONFIGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${D}/usr/share/man/man1" \
+		|| die "emake install failed"
+
+		dohtml *.html
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}
+	else
+		dobin server/gkrellmd || die "dobin failed"
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h || die "doins failed"
+		doins shared/log.h || die "doins failed"
+	fi
+
+	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
+
+	insinto /etc
+	doins server/gkrellmd.conf || die "doins failed"
+
+	dodoc Changelog CREDITS README
+}
+
+pkg_postinst() {
+	if use X ; then
+		ewarn "The old executable name 'gkrellm2' has been removed."
+		ewarn "Run 'gkrellm' instead."
+	fi
+}