diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2010-08-25 15:41:16 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2010-08-25 15:41:16 +0000 |
| commit | 3cf3074f1b5df3f06468d1ce683a649b16b6663a (patch) | |
| tree | 2c1c5a9428837d463bf55750f1cb9524c8cc8098 /x11-plugins/asclock | |
| parent | Linux patch 2.6.32.20. Removal of redundant patch. (diff) | |
| download | historical-3cf3074f1b5df3f06468d1ce683a649b16b6663a.tar.gz historical-3cf3074f1b5df3f06468d1ce683a649b16b6663a.tar.bz2 historical-3cf3074f1b5df3f06468d1ce683a649b16b6663a.zip | |
Migrate changes from Gentoo Prefix overlay. KEYWORDS, EAPI3, CFLAG handling. Approved by maintainer
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'x11-plugins/asclock')
| -rw-r--r-- | x11-plugins/asclock/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/asclock/Manifest | 4 | ||||
| -rw-r--r-- | x11-plugins/asclock/asclock-2.0.12-r1.ebuild | 29 |
3 files changed, 24 insertions, 17 deletions
diff --git a/x11-plugins/asclock/ChangeLog b/x11-plugins/asclock/ChangeLog index c5445b9b839f..fa5c22e54a84 100644 --- a/x11-plugins/asclock/ChangeLog +++ b/x11-plugins/asclock/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/asclock -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/ChangeLog,v 1.22 2009/11/03 15:27:09 voyageur Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/ChangeLog,v 1.23 2010/08/25 15:41:16 darkside Exp $ + + 25 Aug 2010; Jeremy Olexa <darkside@gentoo.org> asclock-2.0.12-r1.ebuild: + Migrate changes from Gentoo Prefix overlay. KEYWORDS, EAPI3, CFLAG + handling. Approved by maintainer 03 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org> asclock-2.0.12-r1.ebuild: diff --git a/x11-plugins/asclock/Manifest b/x11-plugins/asclock/Manifest index 56d4a856e802..0ce7fd16c26e 100644 --- a/x11-plugins/asclock/Manifest +++ b/x11-plugins/asclock/Manifest @@ -1,5 +1,5 @@ AUX asclock-gcc41.patch 1528 RMD160 9e9bd1640cb1f4335d5e10ee11b8232503f4418b SHA1 b8b998d3fb10dfb93717981be7a633abf3c1f99e SHA256 e5a7889a089da8a9c94dfc74f6bd40ac4cdcf82e59db1b4b356915cd96b66355 DIST asclock-2.0.12.tar.gz 111858 RMD160 c3673329c5bcf5be097abb770e861502e20f77ca SHA1 8527d7b013f6d55bdb49e6d6a08c2085d081b486 SHA256 70df9bd991bc707c0fdf76ea1acbeff5924e9ae0b0704feb46afa591030704e6 -EBUILD asclock-2.0.12-r1.ebuild 1469 RMD160 f555b9cb7f782a602623bbbe9c28f5027f00e492 SHA1 bf63481de315f36042a6a8866560f2de9be497a3 SHA256 1b5e39585aa7cc3dcf73a7cf04901e9883d242f5e162bea67d992d95b45998f9 -MISC ChangeLog 2498 RMD160 d846995983aaa3b525134542c26b83d1bde8984c SHA1 679cb550214beff80a91d96da00d2d74855bbfeb SHA256 d6195f64c2d141285e1812ddc16f5f69f95ba7e6a8547e60d32d01020ee80381 +EBUILD asclock-2.0.12-r1.ebuild 1621 RMD160 e3852dd99ac69682df11b62daa52e61630a75be9 SHA1 50677e449973c192d56b17293ef0588648d4f3e2 SHA256 04d45a7aba4c23caa0121fc07c3b8737512228052ce39b052176852c94892fcc +MISC ChangeLog 2679 RMD160 4af9606688753d73a3a2c3a5a188b0e921d45c62 SHA1 a92546dc325d33dc7ebfbf89a07e082985b9d31f SHA256 2602d831c93c71668951ed5ab0dd9a522e0b3f03de4be6f848af3e1ec013ec5d MISC metadata.xml 163 RMD160 46208909b296ad228342e5181a46ef97a03129c7 SHA1 deae2be5c8bfd52bb2842f43b9dc83a8e9a222a6 SHA256 27db507976bc3b54b88de916fc7a04aed51f3cc08c72ba9a1d012ef904bbc57c diff --git a/x11-plugins/asclock/asclock-2.0.12-r1.ebuild b/x11-plugins/asclock/asclock-2.0.12-r1.ebuild index c4325d4cb90f..d531fc52d97d 100644 --- a/x11-plugins/asclock/asclock-2.0.12-r1.ebuild +++ b/x11-plugins/asclock/asclock-2.0.12-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ +EAPI=3 inherit eutils toolchain-funcs IUSE="" @@ -10,31 +11,33 @@ SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz" HOMEPAGE="http://www.tigr.net/afterstep/list.pl" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~mips ppc sparc x86" +KEYWORDS="~amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris" DEPEND="x11-libs/libXpm" RDEPEND="${DEPEND} x11-proto/xextproto x11-proto/xproto" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${PN}-gcc41.patch ln -s themes/classic default_theme } +src_configure() { :; } + src_compile() { local x + # will break Solaris + [[ ${CHOST} == *-linux-gnu ]] && CFLAGS="${CFLAGS} \ + -Dlinux \ + -D_POSIX_C_SOURCE=199309L \ + -D_POSIX_SOURCE \ + -D_XOPEN_SOURCE" for x in asclock parser symbols config do $(tc-getCC) \ ${CPPFLAGS} ${CFLAGS} ${ASFLAGS} \ - -I/usr/include \ - -Dlinux \ - -D_POSIX_C_SOURCE=199309L \ - -D_POSIX_SOURCE \ - -D_XOPEN_SOURCE \ + -I"${EPREFIX}"/usr/include \ -D_BSD_SOURCE \ -D_SVID_SOURCE \ -DFUNCPROTO=15 \ @@ -45,8 +48,8 @@ src_compile() { ${LDFLAGS} \ -o asclock \ asclock.o parser.o symbols.o config.o \ - -L/usr/lib \ - -L/usr/lib/X11 \ + -L"${EPREFIX}"/usr/lib \ + -L"${EPREFIX}"/usr/lib/X11 \ -lXpm -lXext -lX11 || die "link asclock failed" } |