From 5509e1124069ead7e52d8b02ccb2a00a70288a6e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 4 Jan 2007 18:59:57 +0000 Subject: [PATCH] Fix broken autotools handling. Package-Manager: portage-2.1.2_rc4-r5 --- x11-libs/xosd/ChangeLog | 7 +++++-- x11-libs/xosd/Manifest | 24 ++++++++++++------------ x11-libs/xosd/xosd-2.2.14-r1.ebuild | 20 ++++++++------------ 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog index fc5451f59142..df656405cefd 100644 --- a/x11-libs/xosd/ChangeLog +++ b/x11-libs/xosd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/xosd -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.57 2006/11/13 14:35:35 flameeyes Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.58 2007/01/04 18:59:57 flameeyes Exp $ + + 04 Jan 2007; Diego Pettenò xosd-2.2.14-r1.ebuild: + Fix broken autotools handling. 13 Nov 2006; Diego Pettenò -files/2.2.8-xmms-trackpos.patch, xosd-2.2.8-r1.ebuild, diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest index 2a7a7d42cc36..055989cb9ca9 100644 --- a/x11-libs/xosd/Manifest +++ b/x11-libs/xosd/Manifest @@ -22,18 +22,18 @@ EBUILD xosd-2.2.10-r1.ebuild 988 RMD160 5b512286b84fe98a569776c363e94d4f02e1803e MD5 3174fea601630a2275ab24ccba85fefd xosd-2.2.10-r1.ebuild 988 RMD160 5b512286b84fe98a569776c363e94d4f02e1803e xosd-2.2.10-r1.ebuild 988 SHA256 4e6a1fd6295a881d648f94d8a0ef6fef0a0250cdbcdf27222e59a550daeafe62 xosd-2.2.10-r1.ebuild 988 -EBUILD xosd-2.2.14-r1.ebuild 1491 RMD160 c97ce2b5749eef00c48ca519cc99dfcd0cd8f15a SHA1 bbea1f39a381db75b1da155b136a8156d99b387e SHA256 63d07a4a487cffe2c1edc3c8da0c1e4580269bffb1d428642cba98d70340b24f -MD5 785dea5ec88333fc79c4f5f3c67ee227 xosd-2.2.14-r1.ebuild 1491 -RMD160 c97ce2b5749eef00c48ca519cc99dfcd0cd8f15a xosd-2.2.14-r1.ebuild 1491 -SHA256 63d07a4a487cffe2c1edc3c8da0c1e4580269bffb1d428642cba98d70340b24f xosd-2.2.14-r1.ebuild 1491 +EBUILD xosd-2.2.14-r1.ebuild 1371 RMD160 6a3343c91e0993e4a9855debb77c5e074aa4e160 SHA1 e4d32b8e6ea2d4dd3c7999419666164bae8e9a06 SHA256 15c25dcec85052ae1453e875cbc0322b4c7899b55f93ea95f72b7f31c4d16cb1 +MD5 8c1720a02a733355a56dd7cda47ca89e xosd-2.2.14-r1.ebuild 1371 +RMD160 6a3343c91e0993e4a9855debb77c5e074aa4e160 xosd-2.2.14-r1.ebuild 1371 +SHA256 15c25dcec85052ae1453e875cbc0322b4c7899b55f93ea95f72b7f31c4d16cb1 xosd-2.2.14-r1.ebuild 1371 EBUILD xosd-2.2.8-r1.ebuild 1066 RMD160 758988fca7731e408445f141a79a823a07f3098c SHA1 7fdb11800686f9d73585c9a1a63ca55333006f7d SHA256 60de059733576fa09551fd1fe3775657fd522f1ecd7f2d9bb7fe677011b76c9e MD5 9ad823c7480aa18626261fe72dca1e32 xosd-2.2.8-r1.ebuild 1066 RMD160 758988fca7731e408445f141a79a823a07f3098c xosd-2.2.8-r1.ebuild 1066 SHA256 60de059733576fa09551fd1fe3775657fd522f1ecd7f2d9bb7fe677011b76c9e xosd-2.2.8-r1.ebuild 1066 -MISC ChangeLog 7874 RMD160 1d94d336769c6cab90088745998dffdd171a4d19 SHA1 af6f528868c1bbd21ea6714d1b5d87b82d62aefb SHA256 ad3eb876e161d2049a2fec4c748c9f97bec6d290a6db3bb38846c2528af757c4 -MD5 f7848b2b54cc59ff0da1459b6cbcb090 ChangeLog 7874 -RMD160 1d94d336769c6cab90088745998dffdd171a4d19 ChangeLog 7874 -SHA256 ad3eb876e161d2049a2fec4c748c9f97bec6d290a6db3bb38846c2528af757c4 ChangeLog 7874 +MISC ChangeLog 7984 RMD160 264dd82aa6135b701dce6d9f8b610db94c8c5ff2 SHA1 eb801faf96b0ebb88160f864d7c32b29ef82c34f SHA256 fa6049b87eaab5a840ed00e8878d7932782b68af62a459f9a302abd57167da71 +MD5 c597633e90d99871793538aa876d4ab3 ChangeLog 7984 +RMD160 264dd82aa6135b701dce6d9f8b610db94c8c5ff2 ChangeLog 7984 +SHA256 fa6049b87eaab5a840ed00e8878d7932782b68af62a459f9a302abd57167da71 ChangeLog 7984 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160 @@ -48,9 +48,9 @@ MD5 208156b10521262aa1c37677c710c9cd files/digest-xosd-2.2.8-r1 235 RMD160 f751608b3a8f6c021f9e56e116acf41d0838d161 files/digest-xosd-2.2.8-r1 235 SHA256 c33403732545fb95f2207b2803906b85ea3297d3a071c70fc5474bb0aefa1397 files/digest-xosd-2.2.8-r1 235 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFWILbAiZjviIA2XgRAsoXAKCB9CLL85hRevaRZMhSHAuFAJs3jACgglc5 -zFYcW/kTo6H6/tT0Bd5fbX0= -=qokL +iD8DBQFFnU62AiZjviIA2XgRAldMAJ9IpKUvy/VO1z2pXkbN+pw4jL1EegCeJ2vy +SutNWata7+CYx+2PfxKsV8E= +=fuCI -----END PGP SIGNATURE----- diff --git a/x11-libs/xosd/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild index 8005e7746e00..a001b019e21c 100644 --- a/x11-libs/xosd/xosd-2.2.14-r1.ebuild +++ b/x11-libs/xosd/xosd-2.2.14-r1.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-libs/xosd/xosd-2.2.14-r1.ebuild,v 1.3 2006/11/13 14:35:35 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14-r1.ebuild,v 1.4 2007/01/04 18:59:57 flameeyes Exp $ -inherit eutils +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" + +inherit eutils autotools DESCRIPTION="Library for overlaying text/glyphs in X-Windows X-On-Screen-Display plus binary for sending text from command line" HOMEPAGE="http://www.ignavus.net/" @@ -26,9 +29,7 @@ DEPEND="|| ( ( xinerama? ( x11-proto/xineramaproto ) x11-proto/xproto ) virtual/x11 ) - ${RDEPEND} - >=sys-devel/autoconf-2.57 - >=sys-devel/automake-1.8" + ${RDEPEND}" RESTRICT="confcache" @@ -38,12 +39,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-m4.patch epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz - export WANT_AUTOMAKE=1.8 - export WANT_AUTOCONF=2.5 - libtoolize --force --copy || die - aclocal -I ${WORKDIR}/m4 || die - automake -a -f -c || die - autoconf || die + AT_M4DIR="${WORKDIR}/m4" eautoreconf } src_compile() { -- 2.26.2