diff options
| author |   Herbie Hopkins <herbs@gentoo.org> | 2005-04-27 16:45:38 +0000 |
|---|---|---|
| committer | Herbie Hopkins <herbs@gentoo.org> | 2005-04-27 16:45:38 +0000 |
| commit | 66fbe521730743b82d96a455d80ef000e9f7a0ca (patch) | |
| tree | ba6872c42f459b911bc7abc9ab74494fb97c1d4d /app-admin/gkrellm | |
| parent | Cleaning and bumping (diff) | |
| download | gentoo-2-66fbe521730743b82d96a455d80ef000e9f7a0ca.tar.gz gentoo-2-66fbe521730743b82d96a455d80ef000e9f7a0ca.tar.bz2 gentoo-2-66fbe521730743b82d96a455d80ef000e9f7a0ca.zip | |
multilib fixes
(Portage version: 2.0.51.20-r5)
Diffstat (limited to 'app-admin/gkrellm')
| -rw-r--r-- | app-admin/gkrellm/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/gkrellm/Manifest | 22 | ||||
| -rw-r--r-- | app-admin/gkrellm/gkrellm-2.2.5.ebuild | 16 |
3 files changed, 26 insertions, 17 deletions
diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog index c4343660153f..6a93a877aac9 100644 --- a/app-admin/gkrellm/ChangeLog +++ b/app-admin/gkrellm/ChangeLog @@ -1,6 +1,9 @@ # 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.107 2005/04/01 01:43:53 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.108 2005/04/27 16:45:38 herbs Exp $ + + 27 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gkrellm-2.2.5.ebuild: + Multilib fixes. 31 Mar 2005; Aron Griffis <agriffis@gentoo.org> gkrellm-2.2.4.ebuild: stable on ia64 diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest index 70b8a7fd317d..8b83302b6b51 100644 --- a/app-admin/gkrellm/Manifest +++ b/app-admin/gkrellm/Manifest @@ -1,18 +1,18 @@ -MD5 79d94e9e5331f344814c33c6cff81722 ChangeLog 14718 -MD5 0a083390da73e5e82d4f18e1528b7790 gkrellm-1.2.13.ebuild 913 -MD5 58b241c787b77b848e94e744dbfacdec gkrellm-2.1.25.ebuild 1775 -MD5 9956668b2cf270caf36923134b69fb88 gkrellm-2.2.5.ebuild 1754 -MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223 -MD5 7f59850137dd74053a1a7481a154b6d7 gkrellm-2.1.28.ebuild 1690 MD5 0b2f0811b0f9278c82b06d1d47a0fc2f gkrellm-2.1.28-r1.ebuild 1749 MD5 55c4bc6db4f85a560079579542c1dd86 gkrellm-2.2.4.ebuild 1739 +MD5 0a083390da73e5e82d4f18e1528b7790 gkrellm-1.2.13.ebuild 913 +MD5 7f59850137dd74053a1a7481a154b6d7 gkrellm-2.1.28.ebuild 1690 +MD5 d332084ff83af13a0ef3f1680fc1c67f ChangeLog 14808 +MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223 +MD5 5a2bd28deef247678cafca8081adbe87 gkrellm-2.2.5.ebuild 1985 +MD5 58b241c787b77b848e94e744dbfacdec gkrellm-2.1.25.ebuild 1775 +MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28-r1 67 +MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-2.1.24-mail.patch 894 +MD5 46477c5d5356a18fe4da5e0548f03af9 files/gkrellmd 591 MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67 MD5 1f1f72757719eee0c20cbd1c1bf1bc60 files/digest-gkrellm-2.1.25 67 -MD5 b6f665a21b9065a69375dbf57b7acc28 files/gkrellm-dotkeep.patch 423 -MD5 7aee38c8548f2dd99532a9fd5fbf7640 files/digest-gkrellm-2.2.5 66 -MD5 46477c5d5356a18fe4da5e0548f03af9 files/gkrellmd 591 -MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-2.1.24-mail.patch 894 MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28 67 -MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28-r1 67 MD5 5d126e706c3eccd634e22ccfb007eede files/slit_gtk+-2.4.0.patch 448 +MD5 b6f665a21b9065a69375dbf57b7acc28 files/gkrellm-dotkeep.patch 423 MD5 306e201300b226a8ddd6ef90dd3ad087 files/digest-gkrellm-2.2.4 66 +MD5 7aee38c8548f2dd99532a9fd5fbf7640 files/digest-gkrellm-2.2.5 66 diff --git a/app-admin/gkrellm/gkrellm-2.2.5.ebuild b/app-admin/gkrellm/gkrellm-2.2.5.ebuild index 0441b4002462..1bd6a7d011df 100644 --- a/app-admin/gkrellm/gkrellm-2.2.5.ebuild +++ b/app-admin/gkrellm/gkrellm-2.2.5.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.2.5.ebuild,v 1.2 2005/04/01 22:53:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.5.ebuild,v 1.3 2005/04/27 16:45:38 herbs Exp $ inherit eutils @@ -25,10 +25,16 @@ S=${WORKDIR}/${P/a/} src_compile() { local myconf if ! use nls; then - sed -i "s:enable_nls=1:enable_nls=0:" Makefile + sed -i "s:enable_nls=1:enable_nls=0:" Makefile || die fi - sed -i 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' Makefile + sed -i -e 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' \ + -e "s:\(PKGCONFIGDIR ?= \$(INSTALLROOT)/\)lib:\1$(get_libdir):" \ + Makefile || die + + sed -i -e "s:/usr/lib:/usr/$(get_libdir):" \ + -e "s:/usr/local/lib:/usr/local/$(get_libdir):" \ + src/gkrellm.h || die if use X then @@ -46,14 +52,14 @@ src_install() { if use X then keepdir /usr/share/gkrellm2/themes - keepdir /usr/lib/gkrellm2/plugins + keepdir /usr/$(get_libdir)/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 + PKGCONFIGDIR=${D}/usr/$(get_libdir)/pkgconfig cd ${S} mv gkrellm.1 gkrellm2.1 |