changing depend. closes 65969

(Portage version: 2.0.51.19)

4 files changed, 8 insertions, 82 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index b3c4215a4033..67a8bd0acc47 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.109 2005/05/18 21:45:46 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.110 2005/05/18 21:48:57 mholzer Exp $
+
+  18 May 2005; Martin Holzer <mholzer@gentoo.org> -gkrellm-2.1.28.ebuild,
+  gkrellm-2.1.28-r1.ebuild:
+  changing depend. closes 65969
 
 *gkrellm-2.2.6 (18 May 2005)
 
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.1.28 b/app-admin/gkrellm/files/digest-gkrellm-2.1.28
deleted file mode 100644
index 1ad6f3f76e90..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.1.28
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a3f0d0c8a7e8eda345ab9a0aa0038f8b gkrellm-2.1.28.tar.bz2 633487
diff --git a/app-admin/gkrellm/gkrellm-2.1.28-r1.ebuild b/app-admin/gkrellm/gkrellm-2.1.28-r1.ebuild
index 1cfdc2da3527..7d700db91680 100644
--- a/app-admin/gkrellm/gkrellm-2.1.28-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.1.28-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.28-r1.ebuild,v 1.10 2005/01/01 11:01:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.28-r1.ebuild,v 1.11 2005/05/18 21:48:57 mholzer Exp $
 
 inherit eutils
 
@@ -16,7 +16,8 @@ IUSE="X nls ssl"
 
 DEPEND=">=sys-apps/sed-4
 	ssl? ( dev-libs/openssl )
-	X? (  >=x11-libs/gtk+-2.0.5 )"
+	X? (  >=x11-libs/gtk+-2.0.5 )
+	!X? ( =dev-libs/glib-1* )"
 RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext )"
 
diff --git a/app-admin/gkrellm/gkrellm-2.1.28.ebuild b/app-admin/gkrellm/gkrellm-2.1.28.ebuild
deleted file mode 100644
index d4fb708bd7fa..000000000000
--- a/app-admin/gkrellm/gkrellm-2.1.28.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.28.ebuild,v 1.6 2005/01/01 11:01:50 eradicator Exp $
-
-S=${WORKDIR}/${P/a/}
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86 ppc ~alpha ~sparc ~hppa ~amd64 ~ia64"
-IUSE="X nls ssl"
-
-DEPEND=">=sys-apps/sed-4
-	ssl? ( dev-libs/openssl )
-	X? (  >=x11-libs/gtk+-2.0.5 )"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-	if ! use nls; then
-		sed -i "s:enable_nls=1:enable_nls=0:" Makefile
-	fi
-
-	sed -i 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' Makefile
-
-	if use X
-	then
-	use ssl || myconf="without-ssl=yes"
-		PREFIX=/usr emake ${myconf} || die
-	else
-		cd ${S}/server
-		emake glib12=1 || die
-	fi
-}
-
-src_install() {
-	dodir /usr/{bin,include,share/man}
-
-	if use X
-	then
-		keepdir /usr/share/gkrellm2/themes
-		keepdir /usr/lib/gkrellm2/plugins
-
-		make DESTDIR=${D} install \
-			INSTALLDIR=${D}/usr/bin \
-			MANDIR=${D}/usr/share/man/man1 \
-			INCLUDEDIR=${D}/usr/include \
-			LOCALEDIR=${D}/usr/share/locale \
-			PKGCONFIGDIR=${D}/usr/lib/pkgconfig
-
-		cd ${S}
-		mv gkrellm.1 gkrellm2.1
-
-		mv src/gkrellm src/gkrellm2
-		dobin src/gkrellm2
-		rm -f ${D}/usr/bin/gkrellm
-	else
-		cd ${S}/server
-		dobin gkrellmd
-		cd ${S}
-		rm gkrellm.1
-	fi
-
-	rm -f ${D}/usr/share/man/man1/*
-	doman *.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/gkrellmd
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	dodoc COPYRIGHT CREDITS INSTALL README Changelog
-	dohtml *.html
-}