| 1 |
darkside 10/08/25 15:54:04 |
| 2 |
|
| 3 |
Modified: ChangeLog wmload-0.9.2.ebuild |
| 4 |
Log: |
| 5 |
Migrate changes from Gentoo Prefix overlay. KEYWORDS, EAPI3, specific patches. Approved by maintainer. Also respect LDFLAGS as an extra QA commit. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.11 x11-plugins/wmload/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmload/ChangeLog?rev=1.11&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmload/ChangeLog?rev=1.11&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmload/ChangeLog?r1=1.10&r2=1.11 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/wmload/ChangeLog,v |
| 18 |
retrieving revision 1.10 |
| 19 |
retrieving revision 1.11 |
| 20 |
diff -u -r1.10 -r1.11 |
| 21 |
--- ChangeLog 26 Nov 2008 00:01:43 -0000 1.10 |
| 22 |
+++ ChangeLog 25 Aug 2010 15:54:04 -0000 1.11 |
| 23 |
@@ -1,6 +1,12 @@ |
| 24 |
# ChangeLog for x11-plugins/wmload |
| 25 |
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/ChangeLog,v 1.10 2008/11/26 00:01:43 tcunha Exp $ |
| 27 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/ChangeLog,v 1.11 2010/08/25 15:54:04 darkside Exp $ |
| 29 |
+ |
| 30 |
+ 25 Aug 2010; Jeremy Olexa <darkside@g.o> wmload-0.9.2.ebuild, |
| 31 |
+ +files/wmload-0.9.2-prefix.patch, +files/wmload.solaris.patch: |
| 32 |
+ Migrate changes from Gentoo Prefix overlay. KEYWORDS, EAPI3, specific |
| 33 |
+ patches. Approved by maintainer. Also respect LDFLAGS as an extra QA |
| 34 |
+ commit. |
| 35 |
|
| 36 |
26 Nov 2008; Tiago Cunha <tcunha@g.o> wmload-0.9.2.ebuild: |
| 37 |
stable sparc, bug 215651 |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.11 x11-plugins/wmload/wmload-0.9.2.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmload/wmload-0.9.2.ebuild?rev=1.11&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmload/wmload-0.9.2.ebuild?rev=1.11&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmload/wmload-0.9.2.ebuild?r1=1.10&r2=1.11 |
| 46 |
|
| 47 |
Index: wmload-0.9.2.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/wmload/wmload-0.9.2.ebuild,v |
| 50 |
retrieving revision 1.10 |
| 51 |
retrieving revision 1.11 |
| 52 |
diff -u -r1.10 -r1.11 |
| 53 |
--- wmload-0.9.2.ebuild 26 Nov 2008 00:01:43 -0000 1.10 |
| 54 |
+++ wmload-0.9.2.ebuild 25 Aug 2010 15:54:04 -0000 1.11 |
| 55 |
@@ -1,7 +1,8 @@ |
| 56 |
-# Copyright 1999-2008 Gentoo Foundation |
| 57 |
+# Copyright 1999-2010 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/wmload-0.9.2.ebuild,v 1.10 2008/11/26 00:01:43 tcunha Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/wmload-0.9.2.ebuild,v 1.11 2010/08/25 15:54:04 darkside Exp $ |
| 61 |
|
| 62 |
+EAPI=3 |
| 63 |
inherit eutils |
| 64 |
|
| 65 |
IUSE="" |
| 66 |
@@ -20,21 +21,28 @@ |
| 67 |
|
| 68 |
SLOT="0" |
| 69 |
LICENSE="GPL-2" |
| 70 |
-KEYWORDS="~amd64 ppc sparc x86" |
| 71 |
+KEYWORDS="~amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" |
| 72 |
|
| 73 |
-src_unpack() { |
| 74 |
- unpack ${A} |
| 75 |
- cd "${S}" |
| 76 |
+src_prepare() { |
| 77 |
epatch "${FILESDIR}"/${PN}-ComplexProgramTargetNoMan.patch |
| 78 |
+ epatch "${FILESDIR}"/${PN}.solaris.patch |
| 79 |
+ epatch "${FILESDIR}"/${P}-prefix.patch |
| 80 |
+ [[ ${CHOST} == *-solaris* ]] && \ |
| 81 |
+ sed -i -e 's/\(^XPMLIB = \)\(.*$\)/\1-lkstat \2/' Imakefile |
| 82 |
} |
| 83 |
|
| 84 |
-src_compile() { |
| 85 |
+src_configure() { |
| 86 |
xmkmf || die "xmkmf failed." |
| 87 |
- emake CDEBUGFLAGS="${CFLAGS}" || die "emake failed." |
| 88 |
+} |
| 89 |
+ |
| 90 |
+src_compile() { |
| 91 |
+ emake CDEBUGFLAGS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}" \ |
| 92 |
+ || die "emake failed." |
| 93 |
} |
| 94 |
|
| 95 |
src_install() { |
| 96 |
- einstall DESTDIR="${D}" BINDIR=/usr/bin || die "einstall failed." |
| 97 |
+ einstall DESTDIR="${D}" BINDIR="${EPREFIX}"/usr/bin \ |
| 98 |
+ || die "einstall failed." |
| 99 |
|
| 100 |
dodoc README |
Archives