remove --disable-new-xmms (bug #260268) - add RDEPEND on font-misc-misc (bug #261398) - fix repoman warnings - remove old versions - thanks Renato Alves and Sandro Bonazzola

(Portage version: 2.2_rc24/cvs/Linux i686)

4 files changed, 13 insertions, 101 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index 8117b036d4d6..a50fa6548d1a 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/xosd
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.75 2008/06/21 06:53:07 drac Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.76 2009/03/13 23:36:39 bangert Exp $
+
+  13 Mar 2009; Thilo Bangert <bangert@gentoo.org> -xosd-2.2.8-r1.ebuild,
+  -xosd-2.2.10-r1.ebuild, xosd-2.2.14-r1.ebuild:
+  remove --disable-new-xmms (bug #260268) - add RDEPEND on font-misc-misc (bug
+  #261398) - fix repoman warnings - remove old versions
 
   18 Jun 2008; Jeremy Olexa <darkside@gentoo.org> xosd-2.2.14-r1.ebuild:
   Add missing pkgconfig dep to xosd. Fixes bug #227713
diff --git a/x11-libs/xosd/xosd-2.2.10-r1.ebuild b/x11-libs/xosd/xosd-2.2.10-r1.ebuild
deleted file mode 100644
index 8dd2997a7dcf..000000000000
--- a/x11-libs/xosd/xosd-2.2.10-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.10-r1.ebuild,v 1.4 2007/07/22 03:11:37 dberkholz Exp $
-
-inherit eutils
-
-IUSE="xinerama"
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ~sparc x86"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-src_compile() {
-	local myconf=""
-
-	use xinerama || myconf="${myconf} --disable-xinerama"
-
-	myconf="${myconf} --disable-new-plugin"
-
-	econf ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog NEWS COPYING README
-
-	if [ -d ${D}no ]; then
-		rmdir ${D}no
-	fi
-}
diff --git a/x11-libs/xosd/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
index 4bc7b70ab598..e522401baa87 100644
--- a/x11-libs/xosd/xosd-2.2.14-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
@@ -1,13 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.20 2008/06/21 06:53:07 drac Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14-r1.ebuild,v 1.21 2009/03/13 23:36:39 bangert Exp $
 
 inherit eutils autotools
 
-DESCRIPTION="Library for overlaying text/glyphs in X-Windows X-On-Screen-Display plus binary for sending text from command line"
+DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display plus binary for sending text from CLI"
 HOMEPAGE="https://sourceforge.net/projects/libxosd/"
 SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
 	mirror://debian/pool/main/x/xosd/${PN}_${PV}-1.diff.gz
@@ -20,7 +17,8 @@ IUSE="xinerama"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXt"
+	x11-libs/libXt
+	media-fonts/font-misc-misc"
 DEPEND="${RDEPEND}
 	xinerama? ( x11-proto/xineramaproto )
 	x11-proto/xextproto
@@ -38,8 +36,7 @@ src_unpack() {
 
 src_compile() {
 	econf \
-		$(use_enable xinerama) \
-		--disable-new-xmms \
+		$(use_enable xinerama)
 	emake || die "emake failed"
 }
 
diff --git a/x11-libs/xosd/xosd-2.2.8-r1.ebuild b/x11-libs/xosd/xosd-2.2.8-r1.ebuild
deleted file mode 100644
index 3565b1e92fae..000000000000
--- a/x11-libs/xosd/xosd-2.2.8-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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.8-r1.ebuild,v 1.12 2007/07/22 03:11:37 dberkholz Exp $
-
-inherit eutils
-
-IUSE="xinerama"
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}"/${P}-libxosd.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	use xinerama || myconf="${myconf} --disable-xinerama"
-
-	myconf="${myconf} --disable-new-plugin"
-
-	econf ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog NEWS COPYING README
-
-	if [ -d ${D}no ]; then
-		rmdir ${D}no
-	fi
-}