| 1 |
darkside 10/08/25 15:41:16 |
| 2 |
|
| 3 |
Modified: ChangeLog asclock-2.0.12-r1.ebuild |
| 4 |
Log: |
| 5 |
Migrate changes from Gentoo Prefix overlay. KEYWORDS, EAPI3, CFLAG handling. Approved by maintainer |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.23 x11-plugins/asclock/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/asclock/ChangeLog?rev=1.23&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/asclock/ChangeLog?rev=1.23&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/asclock/ChangeLog?r1=1.22&r2=1.23 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/asclock/ChangeLog,v |
| 18 |
retrieving revision 1.22 |
| 19 |
retrieving revision 1.23 |
| 20 |
diff -u -r1.22 -r1.23 |
| 21 |
--- ChangeLog 3 Nov 2009 15:27:09 -0000 1.22 |
| 22 |
+++ ChangeLog 25 Aug 2010 15:41:16 -0000 1.23 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for x11-plugins/asclock |
| 25 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/ChangeLog,v 1.22 2009/11/03 15:27:09 voyageur Exp $ |
| 27 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/ChangeLog,v 1.23 2010/08/25 15:41:16 darkside Exp $ |
| 29 |
+ |
| 30 |
+ 25 Aug 2010; Jeremy Olexa <darkside@g.o> asclock-2.0.12-r1.ebuild: |
| 31 |
+ Migrate changes from Gentoo Prefix overlay. KEYWORDS, EAPI3, CFLAG |
| 32 |
+ handling. Approved by maintainer |
| 33 |
|
| 34 |
03 Nov 2009; Bernard Cafarelli <voyageur@g.o> |
| 35 |
asclock-2.0.12-r1.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.9 x11-plugins/asclock/asclock-2.0.12-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/asclock/asclock-2.0.12-r1.ebuild?rev=1.9&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/asclock/asclock-2.0.12-r1.ebuild?rev=1.9&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/asclock/asclock-2.0.12-r1.ebuild?r1=1.8&r2=1.9 |
| 44 |
|
| 45 |
Index: asclock-2.0.12-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/asclock/asclock-2.0.12-r1.ebuild,v |
| 48 |
retrieving revision 1.8 |
| 49 |
retrieving revision 1.9 |
| 50 |
diff -u -r1.8 -r1.9 |
| 51 |
--- asclock-2.0.12-r1.ebuild 3 Nov 2009 15:27:09 -0000 1.8 |
| 52 |
+++ asclock-2.0.12-r1.ebuild 25 Aug 2010 15:41:16 -0000 1.9 |
| 53 |
@@ -1,7 +1,8 @@ |
| 54 |
-# Copyright 1999-2009 Gentoo Foundation |
| 55 |
+# Copyright 1999-2010 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/asclock-2.0.12-r1.ebuild,v 1.8 2009/11/03 15:27:09 voyageur Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/asclock-2.0.12-r1.ebuild,v 1.9 2010/08/25 15:41:16 darkside Exp $ |
| 59 |
|
| 60 |
+EAPI=3 |
| 61 |
inherit eutils toolchain-funcs |
| 62 |
|
| 63 |
IUSE="" |
| 64 |
@@ -10,31 +11,33 @@ |
| 65 |
HOMEPAGE="http://www.tigr.net/afterstep/list.pl" |
| 66 |
LICENSE="GPL-2" |
| 67 |
SLOT="0" |
| 68 |
-KEYWORDS="~amd64 ~mips ppc sparc x86" |
| 69 |
+KEYWORDS="~amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" |
| 70 |
|
| 71 |
DEPEND="x11-libs/libXpm" |
| 72 |
RDEPEND="${DEPEND} |
| 73 |
x11-proto/xextproto |
| 74 |
x11-proto/xproto" |
| 75 |
|
| 76 |
-src_unpack() { |
| 77 |
- unpack ${A} |
| 78 |
- cd "${S}" |
| 79 |
+src_prepare() { |
| 80 |
epatch "${FILESDIR}"/${PN}-gcc41.patch |
| 81 |
ln -s themes/classic default_theme |
| 82 |
} |
| 83 |
|
| 84 |
+src_configure() { :; } |
| 85 |
+ |
| 86 |
src_compile() { |
| 87 |
local x |
| 88 |
+ # will break Solaris |
| 89 |
+ [[ ${CHOST} == *-linux-gnu ]] && CFLAGS="${CFLAGS} \ |
| 90 |
+ -Dlinux \ |
| 91 |
+ -D_POSIX_C_SOURCE=199309L \ |
| 92 |
+ -D_POSIX_SOURCE \ |
| 93 |
+ -D_XOPEN_SOURCE" |
| 94 |
for x in asclock parser symbols config |
| 95 |
do |
| 96 |
$(tc-getCC) \ |
| 97 |
${CPPFLAGS} ${CFLAGS} ${ASFLAGS} \ |
| 98 |
- -I/usr/include \ |
| 99 |
- -Dlinux \ |
| 100 |
- -D_POSIX_C_SOURCE=199309L \ |
| 101 |
- -D_POSIX_SOURCE \ |
| 102 |
- -D_XOPEN_SOURCE \ |
| 103 |
+ -I"${EPREFIX}"/usr/include \ |
| 104 |
-D_BSD_SOURCE \ |
| 105 |
-D_SVID_SOURCE \ |
| 106 |
-DFUNCPROTO=15 \ |
| 107 |
@@ -45,8 +48,8 @@ |
| 108 |
${LDFLAGS} \ |
| 109 |
-o asclock \ |
| 110 |
asclock.o parser.o symbols.o config.o \ |
| 111 |
- -L/usr/lib \ |
| 112 |
- -L/usr/lib/X11 \ |
| 113 |
+ -L"${EPREFIX}"/usr/lib \ |
| 114 |
+ -L"${EPREFIX}"/usr/lib/X11 \ |
| 115 |
-lXpm -lXext -lX11 || die "link asclock failed" |
| 116 |
} |
Archives