diff options
| -rw-r--r-- | app-admin/gkrellm/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/gkrellm/Manifest | 19 | ||||
| -rw-r--r-- | app-admin/gkrellm/files/digest-gkrellm-2.2.9-r1 | 3 | ||||
| -rw-r--r-- | app-admin/gkrellm/files/gkrellm-2.2.9-build.patch | 105 | ||||
| -rw-r--r-- | app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild | 93 |
5 files changed, 223 insertions, 5 deletions
diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog index 3cc761b39ed0..3b4a2d81c5c9 100644 --- a/app-admin/gkrellm/ChangeLog +++ b/app-admin/gkrellm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/gkrellm # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.122 2006/06/18 14:32:21 malc Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.123 2006/07/04 09:17:37 killerfox Exp $ + +*gkrellm-2.2.9-r1 (04 Jul 2006) + + 04 Jul 2006; Rene Nussbaumer <killerfox@gentoo.org> + +files/gkrellm-2.2.9-build.patch, +gkrellm-2.2.9-r1.ebuild: + Fixed broken plugins. Bug #134096. Thanks to Tristan Heaven for his patch. 18 Jun 2006; <malc@gentoo.org> +files/gkrellm-mbmon-amd64.patch, gkrellm-2.2.9.ebuild: diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest index c4af9a845fc1..3ad9073c4903 100644 --- a/app-admin/gkrellm/Manifest +++ b/app-admin/gkrellm/Manifest @@ -2,6 +2,10 @@ AUX gkrellm-2.1.24-mail.patch 894 RMD160 c14745970c72dd0791b21722c3f240fd35d3373 MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-2.1.24-mail.patch 894 RMD160 c14745970c72dd0791b21722c3f240fd35d33739 files/gkrellm-2.1.24-mail.patch 894 SHA256 a9a937217477f09f3594fe83fc2fd5dc41f73a8588a3b9b69eb4a901f3c86143 files/gkrellm-2.1.24-mail.patch 894 +AUX gkrellm-2.2.9-build.patch 2803 RMD160 8a13f1484577949f767e26b88667d7fd57903f34 SHA1 9ad0a7db14ffff6b42331a2316f09c6f3eddbcfa SHA256 77c3f36dbc705f89d5e96b737227c58212ba87fd6863e9fdd00d252111f0b5f3 +MD5 0741a3bebe8324730aaa6c37d07a4578 files/gkrellm-2.2.9-build.patch 2803 +RMD160 8a13f1484577949f767e26b88667d7fd57903f34 files/gkrellm-2.2.9-build.patch 2803 +SHA256 77c3f36dbc705f89d5e96b737227c58212ba87fd6863e9fdd00d252111f0b5f3 files/gkrellm-2.2.9-build.patch 2803 AUX gkrellm-2.2.9-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 SHA1 03065e5dcf5a9a01f9790652b9a11910456fd589 SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8 MD5 1cb00c2f14fb053c5ded6831f04aa03c files/gkrellm-2.2.9-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 files/gkrellm-2.2.9-gnutls.patch 415 @@ -58,14 +62,18 @@ EBUILD gkrellm-2.2.7.ebuild 1986 RMD160 eddbfc154e0f17853730a2bb0b47751fefd98001 MD5 9e65fffbb4e24034bc27316a609753e0 gkrellm-2.2.7.ebuild 1986 RMD160 eddbfc154e0f17853730a2bb0b47751fefd98001 gkrellm-2.2.7.ebuild 1986 SHA256 cf638157f6e9fa068821853e41fef16a89681bb4669b7f1ca06e1d32eb20f6e0 gkrellm-2.2.7.ebuild 1986 +EBUILD gkrellm-2.2.9-r1.ebuild 2298 RMD160 187977a2775065f4c4748cff49a48a433a263fdb SHA1 a756767da3082f4b7caef78cb989938fdb250ce1 SHA256 5af32bc895b170e83fca47ab594caa0645ff2e4524b0b492c8123ecd90295a4b +MD5 a898ec24cd7b510de246661518f07a4e gkrellm-2.2.9-r1.ebuild 2298 +RMD160 187977a2775065f4c4748cff49a48a433a263fdb gkrellm-2.2.9-r1.ebuild 2298 +SHA256 5af32bc895b170e83fca47ab594caa0645ff2e4524b0b492c8123ecd90295a4b gkrellm-2.2.9-r1.ebuild 2298 EBUILD gkrellm-2.2.9.ebuild 2296 RMD160 58f8a29af355a30f4b78a5c7072fc9cce737cadf SHA1 ca06b42567b6ab0e8eea9c98cada745b0b469fc8 SHA256 f5d0eac1fd333a0f7320fde38221aba26f94a4c86b68336337902f4c5a128cf4 MD5 c6f78c71bc360c0272f004fb2f44f1aa gkrellm-2.2.9.ebuild 2296 RMD160 58f8a29af355a30f4b78a5c7072fc9cce737cadf gkrellm-2.2.9.ebuild 2296 SHA256 f5d0eac1fd333a0f7320fde38221aba26f94a4c86b68336337902f4c5a128cf4 gkrellm-2.2.9.ebuild 2296 -MISC ChangeLog 16450 RMD160 2ac7f71cdf296a4777f6dc08c79956e3b25519c5 SHA1 fea2cfcdc0a131ed5c073b8420b43ac717cebee1 SHA256 20d2f65a9c82620b555033bd4c26b3955f1f01d39622e6ff2397fe3a22041cfc -MD5 6087f4be7fdee83cae79a21808baa26f ChangeLog 16450 -RMD160 2ac7f71cdf296a4777f6dc08c79956e3b25519c5 ChangeLog 16450 -SHA256 20d2f65a9c82620b555033bd4c26b3955f1f01d39622e6ff2397fe3a22041cfc ChangeLog 16450 +MISC ChangeLog 16682 RMD160 11ac4bd03d1d655f690ec291eefa7499b27717b4 SHA1 f1325cf8954510aa285991db31a1fb71bea06f62 SHA256 b79f92facec8ff05a59e91d5c6d9e05ac0221219d9f0ed18ed261790024018a1 +MD5 ffb0165b793c49d03698acbd9640b21e ChangeLog 16682 +RMD160 11ac4bd03d1d655f690ec291eefa7499b27717b4 ChangeLog 16682 +SHA256 b79f92facec8ff05a59e91d5c6d9e05ac0221219d9f0ed18ed261790024018a1 ChangeLog 16682 MISC metadata.xml 223 RMD160 13df98db6609a9a7ddffa345a64e3f08222ce1f9 SHA1 041466a94004d9e3c5aeeb568c77748745bcc35b SHA256 dbb0b5bf8c3292e19f54df0cca95ed2297622fa5abf48c6e835ee8ac2fcfdf70 MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223 RMD160 13df98db6609a9a7ddffa345a64e3f08222ce1f9 metadata.xml 223 @@ -94,3 +102,6 @@ SHA256 a382d69f26d5b25f48ac364c46461a94b2d70e7ac09a182c128cd5c4d9fadcbd files/di MD5 ce818367f079fe7a038297c801251667 files/digest-gkrellm-2.2.9 244 RMD160 0dd16f13d550b601d9085fb84c004d94ee244ef6 files/digest-gkrellm-2.2.9 244 SHA256 3d76715749813c484cdb2f7902ad804fcb1f7d9fe78df7ef936c46742fd0fddc files/digest-gkrellm-2.2.9 244 +MD5 ce818367f079fe7a038297c801251667 files/digest-gkrellm-2.2.9-r1 244 +RMD160 0dd16f13d550b601d9085fb84c004d94ee244ef6 files/digest-gkrellm-2.2.9-r1 244 +SHA256 3d76715749813c484cdb2f7902ad804fcb1f7d9fe78df7ef936c46742fd0fddc files/digest-gkrellm-2.2.9-r1 244 diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.9-r1 b/app-admin/gkrellm/files/digest-gkrellm-2.2.9-r1 new file mode 100644 index 000000000000..04921d477d84 --- /dev/null +++ b/app-admin/gkrellm/files/digest-gkrellm-2.2.9-r1 @@ -0,0 +1,3 @@ +MD5 5334155797901724f4eb46a82ad72395 gkrellm-2.2.9.tar.bz2 691133 +RMD160 e6de12774ec85c51dce18e3208340d1a080a6398 gkrellm-2.2.9.tar.bz2 691133 +SHA256 5f243958342fe0e27432c1d4b01900c5e593b49f00a8bdd29200433b17059de9 gkrellm-2.2.9.tar.bz2 691133 diff --git a/app-admin/gkrellm/files/gkrellm-2.2.9-build.patch b/app-admin/gkrellm/files/gkrellm-2.2.9-build.patch new file mode 100644 index 000000000000..6e47d53a0c23 --- /dev/null +++ b/app-admin/gkrellm/files/gkrellm-2.2.9-build.patch @@ -0,0 +1,105 @@ +--- server/Makefile ++++ server/Makefile +@@ -18,9 +18,8 @@ + MANMODE ?= 644 + MANDIRMODE ?= 755 + INSTALL ?= install +-LINK_FLAGS ?= -Wl,-E ++LDFLAGS += -Wl,-E + CC ?= gcc +-STRIP ?= -s + + GKRELLMD_INCLUDES = gkrellmd.h + +@@ -30,7 +29,7 @@ + GLIB12_INCLUDE = `glib-config --cflags` + GLIB12_LIB = `glib-config --libs glib gmodule` + +-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) ++FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) + ifeq ($(glib12),1) + FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE) + endif +@@ -88,11 +87,11 @@ + all: gkrellmd + + gkrellmd: $(OBJS) +- $(CC) $(OBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS) ++ $(CC) $(OBJS) -o gkrellmd $(LIBS) $(LDFLAGS) + + static: $(OBJS) + $(CC) $(OBJS) -o gkrellmd.static -static \ +- $(LIBS) $(LINK_FLAGS) ++ $(LIBS) $(LDFLAGS) + + freebsd2: + $(MAKE) GTK_CONFIG=gtk12-config \ +@@ -129,11 +128,9 @@ + + install: + $(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR) +- $(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D) ++ $(INSTALL) -c -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D) + $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2 + $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2 +- $(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR) +- $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1 + + uninstall: + rm -f $(SINSTALLDIR)/$(PACKAGE_D) + +--- src/Makefile ++++ src/Makefile +@@ -16,7 +16,7 @@ + MANMODE ?= 644 + MANDIRMODE ?= 755 + INSTALL ?= install +-LINK_FLAGS ?= -Wl,-E ++LDFLAGS += -Wl,-E + SMC_LIBS ?= -L/usr/X11R6/lib -lSM -lICE + + ifeq ($(without-gnutls),1) +@@ -48,7 +48,6 @@ + endif + + CC ?= gcc +-STRIP ?= -s + + GKRELLM_INCLUDES = gkrellm.h gkrellm-public-proto.h + +@@ -56,7 +55,7 @@ + + PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` + +-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) ++FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) + FLAGS+= $(PTHREAD_INC) + + LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(SSL_LIBS) +@@ -95,11 +94,11 @@ + all: gkrellm + + gkrellm: $(OBJS) $(EXTRAOBJS) +- $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellm $(LIBS) $(LINK_FLAGS) ++ $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellm $(LIBS) $(LDFLAGS) + + static: $(OBJS) $(EXTRAOBJS) + $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellm.static -static \ +- $(LIBS) $(LINK_FLAGS) ++ $(LIBS) $(LDFLAGS) + + freebsd2: + ifeq ($(HAVE_SSL),1) +@@ -144,11 +143,9 @@ + + install: + $(INSTALL) -d -m $(INSTALLDIRMODE) $(INSTALLDIR) +- $(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellm $(INSTALLDIR)/$(PACKAGE) ++ $(INSTALL) -c -m $(BINMODE) gkrellm $(INSTALLDIR)/$(PACKAGE) + $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2 + $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2 +- $(INSTALL) -d -m $(MANDIRMODE) $(MANDIR) +- $(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(MANDIR)/$(PACKAGE).1 + + uninstall: + rm -f $(INSTALLDIR)/$(PACKAGE) diff --git a/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild b/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild new file mode 100644 index 000000000000..01797f8a1f5d --- /dev/null +++ b/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.9-r1.ebuild,v 1.1 2006/07/04 09:17:37 killerfox Exp $ + +inherit eutils 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-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="gnutls nls ssl X" + +RDEPEND="dev-libs/glib + gnutls? ( net-libs/gnutls ) + nls? ( virtual/libintl ) + ssl? ( dev-libs/openssl ) + X? ( >=x11-libs/gtk+-2 )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +pkg_setup() { + enewgroup gkrellmd + enewuser gkrellmd -1 -1 -1 gkrellmd +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-build.patch + epatch "${FILESDIR}"/${P}-gnutls.patch + epatch "${FILESDIR}"/gkrellm-mbmon-amd64.patch + + 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" +} + +src_compile() { + if use X ; then + emake \ + CC=$(tc-getCC) \ + INSTALLROOT=/usr \ + INCLUDEDIR=/usr/include/gkrellm2 \ + $(use nls || echo enable_nls=0) \ + $(use gnutls || echo without_gnutls=yes) \ + $(use ssl || echo without_ssl=yes) \ + || die "emake failed" + else + cd server + emake || die "emake failed" + fi +} + +src_install() { + if use X ; then + make install \ + $(use nls || echo enable_nls=0) \ + INSTALLDIR="${D}"/usr/bin \ + INCLUDEDIR="${D}"/usr/include \ + LOCALEDIR="${D}"/usr/share/locale \ + PKGCONFIGDIR="${D}"/usr/$(get_libdir)/pkgconfig \ + || die "make install failed" + + mv "${D}"/usr/bin/{${PN},gkrellm2} + + dohtml *.html + newman ${PN}.1 gkrellm2.1 + + newicon src/icon.xpm ${PN}.xpm + make_desktop_entry gkrellm2 GKrellM ${PN}.xpm + else + dobin server/gkrellmd || die "dobin failed" + + insinto /usr/include/gkrellm2 + doins server/gkrellmd.h + fi + + doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed" + + insinto /etc + doins server/gkrellmd.conf + + doman gkrellmd.1 + dodoc Changelog CREDITS README +} |