From c26d501d3329e2db418412de6f12a83c4107f2fd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 4 Jan 2007 19:09:29 +0000 Subject: [PATCH] Fix broken autotools handling. Package-Manager: portage-2.1.2_rc4-r5 --- x11-wm/kahakai/ChangeLog | 8 ++++-- .../kahakai/kahakai-0.6.2_p20040306-r1.ebuild | 10 +++---- x11-wm/ratpoison/ChangeLog | 7 +++-- x11-wm/ratpoison/ratpoison-1.4.0.ebuild | 16 +++++++----- x11-wm/windowmaker/Manifest | 26 +++++++++++++------ 5 files changed, 42 insertions(+), 25 deletions(-) diff --git a/x11-wm/kahakai/ChangeLog b/x11-wm/kahakai/ChangeLog index fc3f1710e1eb..70e9a604f4b4 100644 --- a/x11-wm/kahakai/ChangeLog +++ b/x11-wm/kahakai/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/kahakai -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/ChangeLog,v 1.27 2006/11/02 02:49:09 nixphoeni Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/ChangeLog,v 1.28 2007/01/04 19:04:35 flameeyes Exp $ + + 04 Jan 2007; Diego Pettenò + kahakai-0.6.2_p20040306-r1.ebuild: + Fix broken autotools handling. 02 Nov 2006; Joe Sapp kahakai-0.6.2_p20040306-r1.ebuild: diff --git a/x11-wm/kahakai/kahakai-0.6.2_p20040306-r1.ebuild b/x11-wm/kahakai/kahakai-0.6.2_p20040306-r1.ebuild index 25add1dc66ce..6e4c1a4aac7e 100644 --- a/x11-wm/kahakai/kahakai-0.6.2_p20040306-r1.ebuild +++ b/x11-wm/kahakai/kahakai-0.6.2_p20040306-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2_p20040306-r1.ebuild,v 1.2 2006/11/02 02:49:09 nixphoeni Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2_p20040306-r1.ebuild,v 1.3 2007/01/04 19:04:35 flameeyes Exp $ WANT_AUTOMAKE=latest WANT_AUTOCONF=latest @@ -31,8 +31,6 @@ RDEPEND="( x11-libs/libX11 dev-util/pkgconfig media-fonts/artwiz-fonts dev-libs/boost" -DEPEND="${RDEPEND} - sys-devel/libtool" S="${WORKDIR}/${PN}" @@ -53,11 +51,11 @@ src_unpack() { epatch ${FILESDIR}/${P}-kastyle_fix.patch # fixes old m4 file problems epatch ${FILESDIR}/${PN}-m4_fixes.patch + + AT_M4DIR="${S}/config/m4" eautoreconf } src_compile() { - libtoolize --copy --force || die - ./autogen.sh || die econf \ $(use_enable ruby) \ $(use_enable xinerama) \ diff --git a/x11-wm/ratpoison/ChangeLog b/x11-wm/ratpoison/ChangeLog index 916ca44aaf84..0c2911a0e923 100644 --- a/x11-wm/ratpoison/ChangeLog +++ b/x11-wm/ratpoison/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-wm/ratpoison -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.39 2006/12/11 22:45:30 weeve Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.40 2007/01/04 19:09:29 flameeyes Exp $ + + 04 Jan 2007; Diego Pettenò ratpoison-1.4.0.ebuild: + Fix broken autotools handling. 11 Dec 2006; Jason Wever ratpoison-1.4.0.ebuild: Fixed PodParser dependency, resolves bug #157680. diff --git a/x11-wm/ratpoison/ratpoison-1.4.0.ebuild b/x11-wm/ratpoison/ratpoison-1.4.0.ebuild index 37246452e5f3..f409b14461e1 100644 --- a/x11-wm/ratpoison/ratpoison-1.4.0.ebuild +++ b/x11-wm/ratpoison/ratpoison-1.4.0.ebuild @@ -1,8 +1,11 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.0.ebuild,v 1.4 2006/12/11 22:45:30 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.4.0.ebuild,v 1.5 2007/01/04 19:09:29 flameeyes Exp $ -inherit elisp-common eutils +WANT_AUTOMAKE=latest +WANT_AUTOCONF=latest + +inherit elisp-common eutils autotools MY_P=${P/_beta/-beta} S=${WORKDIR}/${MY_P} @@ -26,13 +29,12 @@ src_unpack() { unpack ${A} cd ${S}/contrib epatch ${FILESDIR}/ratpoison.el-gentoo.patch + + cd "${S}" + eautoreconf } src_compile() { - if [ "${ARCH}" = "amd64" ] - then - libtoolize -c -f - fi econf || die "econf failed" emake CFLAGS="${CFLAGS} -I/usr/X11R6/include" || die if use emacs; then diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest index c880564716e7..e984214f76c8 100644 --- a/x11-wm/windowmaker/Manifest +++ b/x11-wm/windowmaker/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 0.80.2/gtk2flickerfix.patch 1969 RMD160 a21c185c4d05ba166588e94ad064c87cb7de63eb SHA1 12fbaf19d5a483729300399669e8012028903eb3 SHA256 50c6f7cb9691fd129364154f58f7f0eb4b9e9c80d48eb809fc8d1dd83ace08fe MD5 c8eb68627dc7b53b10143626018ff597 files/0.80.2/gtk2flickerfix.patch 1969 RMD160 a21c185c4d05ba166588e94ad064c87cb7de63eb files/0.80.2/gtk2flickerfix.patch 1969 @@ -70,14 +73,14 @@ EBUILD windowmaker-0.91.0-r1.ebuild 5925 RMD160 8464dba57c22206e8cbbcf23c2573b8d MD5 902604a4e2db5efb352031f4dfa80711 windowmaker-0.91.0-r1.ebuild 5925 RMD160 8464dba57c22206e8cbbcf23c2573b8ddefdbb80 windowmaker-0.91.0-r1.ebuild 5925 SHA256 444ff4e787318caa3574f73d56ea57d6863ddfbc7c78b222907d48de17166eeb windowmaker-0.91.0-r1.ebuild 5925 -EBUILD windowmaker-0.92.0-r3.ebuild 5343 RMD160 38c051c73b5a4179c64d0c84b51618a6159b000d SHA1 d8eea5d0b1aad9e2ebd54fd8ccdd320f213317af SHA256 8b3af16dc4d983e16385bf318c7f15f1d48a739f08a620ba28b3a42f571b0e17 -MD5 4b66063a944b8abc90261a0a0b020310 windowmaker-0.92.0-r3.ebuild 5343 -RMD160 38c051c73b5a4179c64d0c84b51618a6159b000d windowmaker-0.92.0-r3.ebuild 5343 -SHA256 8b3af16dc4d983e16385bf318c7f15f1d48a739f08a620ba28b3a42f571b0e17 windowmaker-0.92.0-r3.ebuild 5343 -MISC ChangeLog 17535 RMD160 7fd5e0ff1ca23b6f452bc785e641d1004d6c142a SHA1 d0c34175ba44d758db71a60ba7eab3f25ebe49e5 SHA256 98dfcd5f7ecf29551a1d359f533a58af94586931516fa2d318012fac323eef40 -MD5 8586eca808bc40676c23c34a5f6647d2 ChangeLog 17535 -RMD160 7fd5e0ff1ca23b6f452bc785e641d1004d6c142a ChangeLog 17535 -SHA256 98dfcd5f7ecf29551a1d359f533a58af94586931516fa2d318012fac323eef40 ChangeLog 17535 +EBUILD windowmaker-0.92.0-r3.ebuild 5195 RMD160 497922ac1acd48bc37bb2b993b035d90e5c35145 SHA1 b2c85fb0a8fd78598e63b447f08e70c149940969 SHA256 0c7af0c7fa9a80371adbdd59a0b4e5d0341cdac5e387ed612e5fba0e80b52068 +MD5 b955e5d3449380af8f8818233727761c windowmaker-0.92.0-r3.ebuild 5195 +RMD160 497922ac1acd48bc37bb2b993b035d90e5c35145 windowmaker-0.92.0-r3.ebuild 5195 +SHA256 0c7af0c7fa9a80371adbdd59a0b4e5d0341cdac5e387ed612e5fba0e80b52068 windowmaker-0.92.0-r3.ebuild 5195 +MISC ChangeLog 17679 RMD160 770900e9819b346ec2e3f5d33cf24bf84692bdd4 SHA1 e4bac7dbc089ad06eed61057c6c7439c51e8711a SHA256 9f4e073e3b529cb0abb3c316cc588f17ab11a3d2fd841432e89b996254f080b8 +MD5 951bc3240ddbdb035600ab41492f2740 ChangeLog 17679 +RMD160 770900e9819b346ec2e3f5d33cf24bf84692bdd4 ChangeLog 17679 +SHA256 9f4e073e3b529cb0abb3c316cc588f17ab11a3d2fd841432e89b996254f080b8 ChangeLog 17679 MISC metadata.xml 160 RMD160 ddb4d678bca64884df87cfab19e00ed9b1ff68a7 SHA1 b3d2981594e6dc70e8f74882cb08b541e1031987 SHA256 264f651f5dc3c8c2d37605e94abe49e6b29b7aed9131e82b473f27e12d67ebe7 MD5 72c8d22e50caaf5dd42b1823f5874206 metadata.xml 160 RMD160 ddb4d678bca64884df87cfab19e00ed9b1ff68a7 metadata.xml 160 @@ -91,3 +94,10 @@ SHA256 b66479e31295f64a312d2d098aef323e8e9cb745edb9acba1b17c9a0b60487d0 files/di MD5 c65600a9a881a199e1f0b5d85ac91a40 files/digest-windowmaker-0.92.0-r3 524 RMD160 7ecd7073fbe68cedeb28ab5df95b8df4491e4f37 files/digest-windowmaker-0.92.0-r3 524 SHA256 f1929cf5dfc688631773e6f18c3e9b0856863825579b372b7a25593125216a30 files/digest-windowmaker-0.92.0-r3 524 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFnVGmAiZjviIA2XgRAjP3AJ9GfwOAB/o2jr3dbi3blKfnNmnT9ACff9Da +oox9vN3yo9IMTGu21sMOhZk= +=mfOD +-----END PGP SIGNATURE----- -- 2.26.2