QA fixes for bug # 120094

(Portage version: 2.1)

4 files changed, 20 insertions, 13 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index e8d85a5dca9c..b92b14a32969 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.51 2005/09/17 01:29:07 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.52 2006/06/11 19:59:52 antarus Exp $
+
+  11 Jun 2006; Alec Warner <antarus@gentoo.org> xosd-2.2.10.ebuild,
+  xosd-2.2.14.ebuild:
+  QA fixes for bug # 120094
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> xosd-2.2.10.ebuild:
   Mark 2.2.10 stable on alpha
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.8-r1 b/x11-libs/xosd/files/digest-xosd-2.2.8-r1
index c466c31d987e..37ad59e097b3 100644
--- a/x11-libs/xosd/files/digest-xosd-2.2.8-r1
+++ b/x11-libs/xosd/files/digest-xosd-2.2.8-r1
@@ -1 +1,3 @@
 MD5 85b00f6609603139855775d6213980cb xosd-2.2.8.tar.bz2 281156
+RMD160 a5ec252699c03b324857ae7d1e32c6c34fe3fc6a xosd-2.2.8.tar.bz2 281156
+SHA256 5e582e6f8ec8595b743302712d595f32eac9d65bfaa4b1dcb1d01b419ff9e422 xosd-2.2.8.tar.bz2 281156
diff --git a/x11-libs/xosd/xosd-2.2.10.ebuild b/x11-libs/xosd/xosd-2.2.10.ebuild
index 6013c6fdf5f5..f9363afa1e3e 100644
--- a/x11-libs/xosd/xosd-2.2.10.ebuild
+++ b/x11-libs/xosd/xosd-2.2.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.ebuild,v 1.3 2005/09/17 01:29:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.10.ebuild,v 1.4 2006/06/11 19:59:52 antarus Exp $
 
 inherit eutils
 
@@ -14,7 +14,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ~sparc ~x86"
 
-DEPEND="virtual/x11
+DEPEND="|| ( (
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-proto/xextproto
+	x11-proto/xineramaproto
+	x11-proto/xproto )
+	virtual/x11 )
 	xmms? ( media-sound/xmms >=media-libs/gdk-pixbuf-0.22.0 )"
 
 src_unpack() {
diff --git a/x11-libs/xosd/xosd-2.2.14.ebuild b/x11-libs/xosd/xosd-2.2.14.ebuild
index 7360eebcdbe3..e1464aff50b4 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
+# Copyright 1999-2006 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.7 2006/01/08 01:37:59 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14.ebuild,v 1.8 2006/06/11 19:59:52 antarus Exp $
 
 inherit eutils
 
@@ -13,14 +13,11 @@ SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="xinerama xmms bmp"
+IUSE="xinerama xmms"
 
 RDEPEND="|| ( ( x11-libs/libX11
 	x11-libs/libXext )
 	virtual/x11 )
-	bmp? (
-		media-sound/beep-media-player
-	)
 	xmms? (
 		media-sound/xmms
 		>=media-libs/gdk-pixbuf-0.22.0
@@ -43,7 +40,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-m4.patch
 	epatch "${FILESDIR}"/2.2.8-xmms-trackpos.patch
 	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
-	epatch ${FILESDIR}/xosd-2.2.14-bmp-fixes.patch
 
 	export WANT_AUTOMAKE=1.8
 	export WANT_AUTOCONF=2.5
@@ -57,7 +53,6 @@ src_compile() {
 	econf \
 		`use_enable xinerama` \
 		`use_enable xmms new-xmms` \
-		`use_enable bmp  new-bmp` || die "econf failed"
 	emake || die "emake failed"
 }