Properly run auto*.

(Portage version: 2.0.51.22-r2)

3 files changed, 22 insertions, 10 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index 70e58b1f671e..1b86a250a831 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/xosd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.46 2005/05/22 19:07:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.47 2005/07/27 11:02:39 eradicator Exp $
+
+  27 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> xosd-2.2.14.ebuild:
+  Properly run auto*.
 
   22 May 2005; Jason Wever <weeve@gentoo.org> xosd-2.2.8-r1.ebuild:
   Stable on SPARC.
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index 8259ce856072..cdef8daa3c06 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,12 +1,12 @@
-MD5 5779266cc348ae8b31b22c29f1db48c4 ChangeLog 6104
+MD5 e5763bd01e3cd1258273608cefa5b99f ChangeLog 6204
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 3f2b043bcd5292c5f5834acdbb62d0a4 xosd-2.2.10.ebuild 1038
 MD5 10956efe64cdc5b4c856238685592839 xosd-2.2.8-r1.ebuild 1033
-MD5 185d7f384f52882bf1e4fab32305bd3d xosd-2.2.14.ebuild 1265
+MD5 f0393ed5105ae7d622726183ddf04f6d xosd-2.2.14.ebuild 1466
+MD5 5b6bffe8689739aff9d0eb219cc443d8 files/2.2.8-xmms-trackpos.patch 5167
 MD5 1132764268b2645df6a9a3ba6bf06e4d files/bmp-dlg_config.patch 403
 MD5 c06ab555d3db962ce6e7d8bfe88940b9 files/digest-xosd-2.2.10 64
-MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8-r1 63
-MD5 5cc83e3e259529faf0fd390e9d8b7d04 files/xosd-2.2.14-m4.patch 242
 MD5 dc6cccd80375fbcc480c1dbfdc651681 files/digest-xosd-2.2.14 132
-MD5 5b6bffe8689739aff9d0eb219cc443d8 files/2.2.8-xmms-trackpos.patch 5167
+MD5 5cc83e3e259529faf0fd390e9d8b7d04 files/xosd-2.2.14-m4.patch 242
+MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8-r1 63
 MD5 7a327614154b7eb25a641f0ad4bdec90 files/xosd-2.2.14-bmp-fixes.patch 11472
diff --git a/x11-libs/xosd/xosd-2.2.14.ebuild b/x11-libs/xosd/xosd-2.2.14.ebuild
index 94cd5b4a0565..9f7a566ada24 100644
--- a/x11-libs/xosd/xosd-2.2.14.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.ebuild,v 1.3 2005/05/16 11:11:47 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14.ebuild,v 1.4 2005/07/27 11:02:39 eradicator Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="xinerama xmms bmp"
 
-DEPEND="virtual/x11
+RDEPEND="virtual/x11
 	bmp? (
 		media-sound/beep-media-player
 	)
@@ -23,6 +23,10 @@ DEPEND="virtual/x11
 		>=media-libs/gdk-pixbuf-0.22.0
 	)"
 
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.57
+	>=sys-devel/automake-1.8"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -30,8 +34,13 @@ src_unpack() {
 	epatch "${FILESDIR}"/2.2.8-xmms-trackpos.patch
 	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
 	epatch ${FILESDIR}/xosd-2.2.14-bmp-fixes.patch
-	automake
-	autoconf
+
+	export WANT_AUTOMAKE=1.8
+	export WANT_AUTOCONF=2.5
+	libtoolize --force --copy || die
+	aclocal || die
+	automake -a -f -c || die
+	autoconf || die
 }
 
 src_compile() {