version bump, bug #57293

7 files changed, 23 insertions, 62 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index bd38c5aafa86..c319937b6f7b 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xosd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.31 2004/06/24 22:09:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.32 2004/07/20 17:36:33 lanius Exp $
+
+  20 Jul 2004; Heinrich Wendel <lanius@gentoo.org> xosd-2.2.4-r2.ebuild,
+  xosd-2.2.5.ebuild:
+  version bump, bug #57293
 
   23 Jun 2004; Aron Griffis <agriffis@gentoo.org> xosd-2.2.4-r2.ebuild,
   xosd-2.2.5.ebuild:
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index 11e23ada24c0..a41d9300fe73 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,11 +1,9 @@
-MD5 ef502648c13a676c9df60b23ce59ec63 xosd-2.2.5.ebuild 987
-MD5 62836d404efd711f31cb850c56a58a2c xosd-2.2.4-r2.ebuild 1022
-MD5 9c2c05ea05ab340054c8aed3228bfb48 ChangeLog 4229
+MD5 b5298577cce520b3b064055fe5293950 xosd-2.2.8.ebuild 991
+MD5 eed0cdeca9cc107d699785d147e2de1c ChangeLog 4349
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 e5c60617c1930e10cafc2bde2a1af1be xosd-2.2.5-r1.ebuild 1035
 MD5 3c380aec54baadc4ae387d9cbba2d714 files/2.2.4-font-align.patch 640
 MD5 99aa8e6851c4a85fcbbcaef42f00ce81 files/xosd-2.2.4-xmms-trackpos.patch 4317
 MD5 7012b7e17c6cf060995e65335222ea2b files/2.2.5-xmms-trackpos.patch 4001
-MD5 47b823d1241bc14385f5e911dcbf545e files/digest-xosd-2.2.5 62
-MD5 3ba5b9b17b7da4ce0b658cd8ba33a4bd files/digest-xosd-2.2.4-r2 67
+MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8 63
 MD5 47b823d1241bc14385f5e911dcbf545e files/digest-xosd-2.2.5-r1 62
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.4-r2 b/x11-libs/xosd/files/digest-xosd-2.2.4-r2
deleted file mode 100644
index 18a537058d72..000000000000
--- a/x11-libs/xosd/files/digest-xosd-2.2.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b5669d2758470cbf717632b5d16dae8 xosd_2.2.4.orig.tar.gz 295886
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.5 b/x11-libs/xosd/files/digest-xosd-2.2.5
deleted file mode 100644
index 60827abb3603..000000000000
--- a/x11-libs/xosd/files/digest-xosd-2.2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 96bae6f0800c1710d7d4edb3b37b01e5 xosd-2.2.5.tar.gz 388861
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.8 b/x11-libs/xosd/files/digest-xosd-2.2.8
new file mode 100644
index 000000000000..c466c31d987e
--- /dev/null
+++ b/x11-libs/xosd/files/digest-xosd-2.2.8
@@ -0,0 +1 @@
+MD5 85b00f6609603139855775d6213980cb xosd-2.2.8.tar.bz2 281156
diff --git a/x11-libs/xosd/xosd-2.2.4-r2.ebuild b/x11-libs/xosd/xosd-2.2.4-r2.ebuild
deleted file mode 100644
index fcdc0df9ce3b..000000000000
--- a/x11-libs/xosd/xosd-2.2.4-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.4-r2.ebuild,v 1.9 2004/06/24 22:09:49 agriffis Exp $
-
-inherit eutils
-
-IUSE="xmms"
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ppc ~alpha hppa"
-
-DEPEND="virtual/x11
-	xmms? ( media-sound/xmms
-	>=media-libs/gdk-pixbuf-0.22.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-font-align.patch
-	epatch ${FILESDIR}/${P}-xmms-trackpos.patch
-}
-
-src_compile() {
-	if use xmms; then
-		myconf="--with-plugindir=/usr/lib/xmms/General"
-	else
-		myconf="--without-plugindir"
-	fi
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog NEWS COPYING README
-}
diff --git a/x11-libs/xosd/xosd-2.2.5.ebuild b/x11-libs/xosd/xosd-2.2.8.ebuild
index 9fed657c560b..be45729ae379 100644
--- a/x11-libs/xosd/xosd-2.2.5.ebuild
+++ b/x11-libs/xosd/xosd-2.2.8.ebuild
@@ -1,35 +1,36 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.5.ebuild,v 1.9 2004/06/24 22:09:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.8.ebuild,v 1.1 2004/07/20 17:36:33 lanius Exp $
 
 inherit eutils
 
+IUSE="xinerama xmms"
+
 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="http://www.ignavus.net/${P}.tar.gz"
+SRC_URI="http://www.ignavus.net/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ppc ~alpha hppa"
-IUSE="xmms"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~ia64 ~amd64"
 
 DEPEND="virtual/x11
-	xmms? ( media-sound/xmms
-	>=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}/${PV}-xmms-trackpos.patch
 }
 
 src_compile() {
 	local myconf=""
-	use xmms \
-		&& myconf="--with-plugindir=/usr/lib/xmms/General" \
-		|| myconf="--without-plugindir"
+
+	use xinerama || myconf="${myconf} --disable-xinerama"
+
+	use xmms || myconf="${myconf} --disable-new-plugin"
 
 	econf ${myconf} || die
+
 	emake || die
 }
 
@@ -37,5 +38,7 @@ src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog NEWS COPYING README
 
-	#use xmms || rmdir ${D}no
+	if [ -d ${D}no ]; then
+		rmdir ${D}no
+	fi
 }