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

Package-Manager: portage-2.2_rc24/cvs/Linux i686

5 files changed, 15 insertions, 107 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/Manifest b/x11-libs/xosd/Manifest
index ddef5400f7b2..598e116f2627 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,13 +1,9 @@
 AUX bmp-dlg_config.patch 403 RMD160 40ec201fe3edf3155c4c9d3dfdc8d30323287446 SHA1 ed5138fa6a43267de7cbc49162a1b053691c3cd0 SHA256 b40712da31de131709f66f85e7032031eebcf20f006f9c6d8c6248b76f53a784
 AUX xosd-2.2.14-m4.patch 242 RMD160 fb73151d99d2f0749a2b0415bb2c07d2f139fc60 SHA1 0012052cd1a3f8553f476409522f29188c8be969 SHA256 c6588e7f37aedaad59358bcaa3b0a46ac983b933b2da32230fa5e07479030015
 AUX xosd-2.2.8-libxosd.patch 465 RMD160 ba9b27aa2b92e4d4e8938359144d96c5ebda04e5 SHA1 d7c7bb53e99efde568c436a127575fddca745c2c SHA256 cf3ab0a0d29e6da56335bea6b05ace7ad48e27d1c6a354c79176595c24a75041
-DIST xosd-2.2.10.tar.bz2 285927 RMD160 78c92a47f1b56e69a6e36771e5d68e38b9f47954 SHA1 13d1482adaed6391702548bc18ec61a70ca5e985 SHA256 117c6f0f9a0b09802700ec2fee09a088cf09d3e63fe11f998f8aaed53f3e3d21
-DIST xosd-2.2.8.tar.bz2 281156 RMD160 a5ec252699c03b324857ae7d1e32c6c34fe3fc6a SHA1 c8261cb6bfc957ba4a91e6b1d118d23e8180882e SHA256 5e582e6f8ec8595b743302712d595f32eac9d65bfaa4b1dcb1d01b419ff9e422
 DIST xosd-gentoo-m4-1.tar.bz2 5043 RMD160 6b464fe90adcee353064db37634bde7255dd0426 SHA1 0e00123455bd5bb8221613d6ee0895b607f21c0d SHA256 6cd8c8e8bef4576e332e9f855e5ae7071b4da5e7ce0e96906531784aec2c061f
 DIST xosd_2.2.14-1.diff.gz 8616 RMD160 a79a47aa50f41c9cfd531c7580b4f175f7b4c068 SHA1 cdba1da203dac3c007836fd0e02c92356e74a075 SHA256 1b74a379030a2a8a1c36b6589023445bc1f620dbfa12ef799590568505f390b2
 DIST xosd_2.2.14.orig.tar.gz 418331 RMD160 8a39756c5a46f2897be9bbd47dd86770f42ed648 SHA1 1d459a62239c9fe842d835bb7f60eb2edd7c979f SHA256 4f1fa96f4895baee6a3cba40f188a0da23bbac9d68e8c326d749e084143cb508
-EBUILD xosd-2.2.10-r1.ebuild 962 RMD160 05508f1ffff0d4cc18d11282f48dab03b2d80c11 SHA1 26155f2ad35e4861737dfc8b635fa8f49b2b468c SHA256 b702cc09d013ce69ae1b5e08f48d3937a2397a1620a949f2d67d7c892ed71935
-EBUILD xosd-2.2.14-r1.ebuild 1302 RMD160 eece29b2171dc09f44db19da8531061018d3dd28 SHA1 3b98f4276202c76677d4cde3497d54e687f5e6d8 SHA256 017329d6f40ddec632a6bccf0d86f30610b9706da81e3bc9d2d849e1d9a26f76
-EBUILD xosd-2.2.8-r1.ebuild 1041 RMD160 afb5b61f785a57e49c89b2301cc868b0a2a942a7 SHA1 c15e726f9d0d6bd7233f20c2fafab0f1d11e8338 SHA256 1dc1afd592e2defac2f27ffc75765ecf6d23085acc6c74f1493a5434d91f62ab
-MISC ChangeLog 9727 RMD160 714e648ec095d5d2e4b7025190e0f14b5cc3217d SHA1 b469e64267e36c3a7efff7067138bd8c29f4874f SHA256 64de45619fd45079c87a0e7de2bba64741335b686c91fe138e43fbc71f20d1d6
+EBUILD xosd-2.2.14-r1.ebuild 1245 RMD160 447e03e6e6809cfdaa7141a2538f13c160a62980 SHA1 f8baad2ca67734cb2b196c8011e8c3c97292a2f1 SHA256 adccf218527e9a4b23b5c103f65cd05309ffb62961dce8b2047f5c067dbad52e
+MISC ChangeLog 9988 RMD160 5a4610000dd562ff8578b9a5809a0152d6c75985 SHA1 7ac25f4756bd098c0c92281727f3d224c3d8c681 SHA256 c4ed400549ffcd0d278b3f4f3a2b8d82e5bb4d904a093b6e3f318fe5f6230c76
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
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
-}