make ebuild suck less and fix m4 warnings

Package-Manager: portage-2.0.51.20-r5

3 files changed, 31 insertions, 29 deletions

diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index 1c768cd404b2..fc1e38dc7f9d 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d7576ed293b4158de9a3ce70e994edf0 xosd-2.2.8-r1.ebuild 1037
-MD5 b288cac0e5205fe2be689332c15bade6 xosd-2.2.14.ebuild 1257
 MD5 d35f2ccd62c884a73e260991a729cfc2 ChangeLog 5829
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+MD5 d7576ed293b4158de9a3ce70e994edf0 xosd-2.2.8-r1.ebuild 1037
 MD5 3f2b043bcd5292c5f5834acdbb62d0a4 xosd-2.2.10.ebuild 1038
-MD5 1132764268b2645df6a9a3ba6bf06e4d files/bmp-dlg_config.patch 403
-MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8-r1 63
-MD5 c06ab555d3db962ce6e7d8bfe88940b9 files/digest-xosd-2.2.10 64
+MD5 3331baaaa7a76e5562c665e6e005a222 xosd-2.2.14.ebuild 1307
 MD5 dc6cccd80375fbcc480c1dbfdc651681 files/digest-xosd-2.2.14 132
+MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8-r1 63
+MD5 5cc83e3e259529faf0fd390e9d8b7d04 files/xosd-2.2.14-m4.patch 242
 MD5 5b6bffe8689739aff9d0eb219cc443d8 files/2.2.8-xmms-trackpos.patch 5167
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCQ/opevY57Fted3ERAvcQAJwIwCayR9gdMQbTYfm97/6SCx+ryACfRAYG
-DLRzqrCrJ3RNKL1BN2a//9E=
-=Wazq
------END PGP SIGNATURE-----
+MD5 c06ab555d3db962ce6e7d8bfe88940b9 files/digest-xosd-2.2.10 64
+MD5 1132764268b2645df6a9a3ba6bf06e4d files/bmp-dlg_config.patch 403
diff --git a/x11-libs/xosd/files/xosd-2.2.14-m4.patch b/x11-libs/xosd/files/xosd-2.2.14-m4.patch
new file mode 100644
index 000000000000..3e529728f8b3
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-2.2.14-m4.patch
@@ -0,0 +1,9 @@
+Fix aclocal warning:
+/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD
+--- xosd-2.2.14/libxosd.m4
++++ xosd-2.2.14/libxosd.m4
+@@ -8,3 +8,3 @@
+ dnl
+-AC_DEFUN(AM_PATH_LIBXOSD,
++AC_DEFUN([AM_PATH_LIBXOSD],
+ [dnl
diff --git a/x11-libs/xosd/xosd-2.2.14.ebuild b/x11-libs/xosd/xosd-2.2.14.ebuild
index c63895217141..577cd2470a36 100644
--- a/x11-libs/xosd/xosd-2.2.14.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14.ebuild
@@ -1,11 +1,9 @@
 # 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.1 2005/03/25 11:46:20 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14.ebuild,v 1.2 2005/04/29 00:17:49 vapier Exp $
 
 inherit eutils
 
-IUSE="xinerama xmms bmp"
-
 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/"
 SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
@@ -13,33 +11,37 @@ SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~ia64 ~amd64 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="xinerama xmms bmp"
 
 DEPEND="virtual/x11
-	bmp? (media-sound/beep-media-player >=media-libs/gdk-pixbuf-0.22.0 )
-	xmms? ( media-sound/xmms >=media-libs/gdk-pixbuf-0.22.0 )"
+	bmp? (
+		media-sound/beep-media-player
+		>=media-libs/gdk-pixbuf-0.22.0
+	)
+	xmms? (
+		media-sound/xmms
+		>=media-libs/gdk-pixbuf-0.22.0
+	)"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/2.2.8-xmms-trackpos.patch
-	epatch ${DISTDIR}/${PN}_${PV}-1.diff.gz
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-m4.patch
+	epatch "${FILESDIR}"/2.2.8-xmms-trackpos.patch
+	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
 }
 
 src_compile() {
 	local myconf=""
-
 	use xinerama || myconf="${myconf} --disable-xinerama"
-
 	use xmms || myconf="${myconf} --disable-new-plugin"
 	use bmp || myconf="${myconf} --disable-beep_media_player"
-
-
 	econf ${myconf} || die
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS COPYING README TODO
 }