diff options
| -rw-r--r-- | x11-plugins/wmcalc/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/wmcalc/Manifest | 20 | ||||
| -rw-r--r-- | x11-plugins/wmcalc/files/wmcalc-0.4-Makefile.patch | 15 | ||||
| -rw-r--r-- | x11-plugins/wmcalc/wmcalc-0.4.ebuild | 51 |
4 files changed, 38 insertions, 56 deletions
diff --git a/x11-plugins/wmcalc/ChangeLog b/x11-plugins/wmcalc/ChangeLog index 7b07a11e5e83..2030ca880252 100644 --- a/x11-plugins/wmcalc/ChangeLog +++ b/x11-plugins/wmcalc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/wmcalc -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.17 2007/07/22 05:19:51 dberkholz Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/ChangeLog,v 1.18 2008/01/06 14:45:31 drac Exp $ + + 06 Jan 2008; Samuli Suominen <drac@gentoo.org> + -files/wmcalc-0.4-Makefile.patch, wmcalc-0.4.ebuild: + Fix include path wrt #204553 and rewrite ebuild. 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmcalc-0.4.ebuild: Drop virtual/x11 references. diff --git a/x11-plugins/wmcalc/Manifest b/x11-plugins/wmcalc/Manifest index baf2c191820c..a2af4b2deff0 100644 --- a/x11-plugins/wmcalc/Manifest +++ b/x11-plugins/wmcalc/Manifest @@ -1,20 +1,16 @@ -AUX wmcalc-0.4-Makefile.patch 493 RMD160 66cd9ec27bec0be2c357f36975065211f2cd7904 SHA1 136106255ea23d8bb8300b2408284b84599b93e1 SHA256 4ef7a776778290c432e550cbb116e62826614564e4905e4c39d0cd607f5a27f2 -MD5 3047ad515640b4bf2d408530eb9c0a0b files/wmcalc-0.4-Makefile.patch 493 -RMD160 66cd9ec27bec0be2c357f36975065211f2cd7904 files/wmcalc-0.4-Makefile.patch 493 -SHA256 4ef7a776778290c432e550cbb116e62826614564e4905e4c39d0cd607f5a27f2 files/wmcalc-0.4-Makefile.patch 493 AUX wmcalc.man 4751 RMD160 38cece7af6edc96595f484511cd6b7399d2482fd SHA1 2e5c0ede7274b9606d059f790ed3d1829b4c8b3d SHA256 68bdb4cb628a663313d7aa1998972bff1840dbe1e6a42052c60e57a6be8908b1 MD5 cb4a94f1ebb3397806349e863d673280 files/wmcalc.man 4751 RMD160 38cece7af6edc96595f484511cd6b7399d2482fd files/wmcalc.man 4751 SHA256 68bdb4cb628a663313d7aa1998972bff1840dbe1e6a42052c60e57a6be8908b1 files/wmcalc.man 4751 DIST wmcalc-0.4.tar.gz 42694 RMD160 626a465303599016305d75ab3272fb617ea9c7dd SHA1 c0352bca3dd3e79880078afe22fbbd7e73f291c1 SHA256 944b69ce2e5489dc0ec78fc02d4da26af2102a18300eb3607c3a5de4b97a384a -EBUILD wmcalc-0.4.ebuild 830 RMD160 239c718606a81158bb138890ad6bb56f8082dbf1 SHA1 75b80fa0ce85adaaf57afd2bda65086c6a3d9781 SHA256 309629a3d23e4b64591c9dbfcc58ad989a4a7671f27a9161a1a0f238b9a75673 -MD5 f9e10815242acdf7b8f22949b9e83dd2 wmcalc-0.4.ebuild 830 -RMD160 239c718606a81158bb138890ad6bb56f8082dbf1 wmcalc-0.4.ebuild 830 -SHA256 309629a3d23e4b64591c9dbfcc58ad989a4a7671f27a9161a1a0f238b9a75673 wmcalc-0.4.ebuild 830 -MISC ChangeLog 2278 RMD160 4dda183339240a7c6a58c2fd57cea2d9f3960470 SHA1 0fc27338480bd3326a66dde645e110d17fd7d131 SHA256 14bc4e3c54c38341fe69e142afe6517c45da1b87b0649db1ed6eef9bb3034f9f -MD5 424ffa6a5c93ce162e2c45b0dd2d8386 ChangeLog 2278 -RMD160 4dda183339240a7c6a58c2fd57cea2d9f3960470 ChangeLog 2278 -SHA256 14bc4e3c54c38341fe69e142afe6517c45da1b87b0649db1ed6eef9bb3034f9f ChangeLog 2278 +EBUILD wmcalc-0.4.ebuild 982 RMD160 16cee4eaa412c97bb0ea97fa04cc64db0762314f SHA1 1fdee20ea971e7c3b84c6428d8858a1d4a742650 SHA256 8d56fc9d0c2612c30f6063d8f26b7fb899036517fb655a49fb207179cd15ee1b +MD5 7e9c07ba64ddba90edbdfc08f338f99f wmcalc-0.4.ebuild 982 +RMD160 16cee4eaa412c97bb0ea97fa04cc64db0762314f wmcalc-0.4.ebuild 982 +SHA256 8d56fc9d0c2612c30f6063d8f26b7fb899036517fb655a49fb207179cd15ee1b wmcalc-0.4.ebuild 982 +MISC ChangeLog 2429 RMD160 664fee365d6c0f0da20dca86c9a757031c3c268b SHA1 879e97c9c6721b5738e60838e6cfba791f6f41a5 SHA256 24615266bf238aa8464dff40a32a754d2764ccc8dbd3767face7e1681d2f05ad +MD5 98cded0e172a7b15e4f9e9acd6a31488 ChangeLog 2429 +RMD160 664fee365d6c0f0da20dca86c9a757031c3c268b ChangeLog 2429 +SHA256 24615266bf238aa8464dff40a32a754d2764ccc8dbd3767face7e1681d2f05ad ChangeLog 2429 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165 diff --git a/x11-plugins/wmcalc/files/wmcalc-0.4-Makefile.patch b/x11-plugins/wmcalc/files/wmcalc-0.4-Makefile.patch deleted file mode 100644 index 966f4c8ad616..000000000000 --- a/x11-plugins/wmcalc/files/wmcalc-0.4-Makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile 2004-08-15 22:23:44.790506624 +0200 -+++ Makefile 2004-08-15 22:24:26.111224920 +0200 -@@ -14,10 +14,10 @@ - INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 - - .c.o: -- gcc -O2 -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o -+ gcc -c -Wall ${INCLUDES} ${CFLAGS} $< -o $*.o - - ${TARGET}: ${OBJECTS} -- gcc -O2 -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS} -+ gcc ${CFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS} - - clean:: - for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done diff --git a/x11-plugins/wmcalc/wmcalc-0.4.ebuild b/x11-plugins/wmcalc/wmcalc-0.4.ebuild index 4e8ffe00eb7a..5f8bc584f3e6 100644 --- a/x11-plugins/wmcalc/wmcalc-0.4.ebuild +++ b/x11-plugins/wmcalc/wmcalc-0.4.ebuild @@ -1,47 +1,44 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild,v 1.11 2007/07/22 05:19:51 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcalc/wmcalc-0.4.ebuild,v 1.12 2008/01/06 14:45:31 drac Exp $ -inherit eutils +inherit multilib toolchain-funcs DESCRIPTION="A WindowMaker DockApp calculator" HOMEPAGE="http://dockapps.org/file.php/id/130" SRC_URI="mirror://gentoo/${P}.tar.gz" -SLOT="0" + LICENSE="GPL-2" -KEYWORDS="x86 amd64 ppc ppc64 ~sparc" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 ~sparc x86" +IUSE="" -DEPEND="x11-libs/libX11 +RDEPEND="x11-libs/libX11 x11-libs/libXext - x11-libs/libXpm + x11-libs/libXpm" +DEPEND="${RDEPEND} x11-proto/xproto x11-proto/xextproto" -IUSE="" - -src_unpack() -{ +src_unpack() { unpack ${A} - cd ${S} - epatch ${FILESDIR}/wmcalc-0.4-Makefile.patch + cd "${S}" + sed -e "s:gcc:$(tc-getCC):g" \ + -e "s:-O2:${CFLAGS}:g" -i Makefile } -src_compile() -{ - emake || die +src_compile() { + emake INCLUDES="-I/usr/include/X11" \ + LIBINC="-L/usr/$(get_libdir)" \ + || die "emake failed." } -src_install () -{ - dobin wmcalc - - dodoc README +src_install() { + dodir /etc /usr/bin - newman ${FILESDIR}/wmcalc.man wmcalc.1 + emake DESTDIR="${D}" PREFIX="/usr" install \ + || die "emake install failed." - insinto /etc - newins .wmcalc wmcalc.conf - - insinto /etc/skel - doins .wmcalc + dodoc README + newman "${FILESDIR}"/wmcalc.man wmcalc.1 } |