QA fixes for bug # 120094

Package-Manager: portage-2.1

5 files changed, 65 insertions, 20 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/Manifest b/x11-libs/xosd/Manifest
index cab3e7a70c04..6b924879f4c8 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,12 +1,50 @@
-MD5 b431e416a23bf30a428e32a1bcc37d58 ChangeLog 6802
+AUX 2.2.8-xmms-trackpos.patch 5167 RMD160 930cc400cc208b86589461ee99da5dde2e796c70 SHA1 e4fd016451a671c18620cb64dc60b8bf2c1b5007 SHA256 623a95978f31f301c55ab19424c1ecf70db5d8f8dfbc8c39224a7dce8b8f1e8c
 MD5 5b6bffe8689739aff9d0eb219cc443d8 files/2.2.8-xmms-trackpos.patch 5167
+RMD160 930cc400cc208b86589461ee99da5dde2e796c70 files/2.2.8-xmms-trackpos.patch 5167
+SHA256 623a95978f31f301c55ab19424c1ecf70db5d8f8dfbc8c39224a7dce8b8f1e8c files/2.2.8-xmms-trackpos.patch 5167
+AUX bmp-dlg_config.patch 403 RMD160 40ec201fe3edf3155c4c9d3dfdc8d30323287446 SHA1 ed5138fa6a43267de7cbc49162a1b053691c3cd0 SHA256 b40712da31de131709f66f85e7032031eebcf20f006f9c6d8c6248b76f53a784
 MD5 1132764268b2645df6a9a3ba6bf06e4d files/bmp-dlg_config.patch 403
-MD5 c06ab555d3db962ce6e7d8bfe88940b9 files/digest-xosd-2.2.10 64
-MD5 9ee14940cb0d412247cc9a15d989cd93 files/digest-xosd-2.2.14 199
-MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8-r1 63
+RMD160 40ec201fe3edf3155c4c9d3dfdc8d30323287446 files/bmp-dlg_config.patch 403
+SHA256 b40712da31de131709f66f85e7032031eebcf20f006f9c6d8c6248b76f53a784 files/bmp-dlg_config.patch 403
+AUX xosd-2.2.14-bmp-fixes.patch 11472 RMD160 7eeca191e8d5a80829c4ba974c709e484416c3c6 SHA1 bcbc3242ed492825f04685f0978797b1d91284dd SHA256 86630811e71b0f779a202b1bbd218167f942dcd8a9ff92bc7115f7986a631f4c
 MD5 7a327614154b7eb25a641f0ad4bdec90 files/xosd-2.2.14-bmp-fixes.patch 11472
+RMD160 7eeca191e8d5a80829c4ba974c709e484416c3c6 files/xosd-2.2.14-bmp-fixes.patch 11472
+SHA256 86630811e71b0f779a202b1bbd218167f942dcd8a9ff92bc7115f7986a631f4c files/xosd-2.2.14-bmp-fixes.patch 11472
+AUX xosd-2.2.14-m4.patch 242 RMD160 fb73151d99d2f0749a2b0415bb2c07d2f139fc60 SHA1 0012052cd1a3f8553f476409522f29188c8be969 SHA256 c6588e7f37aedaad59358bcaa3b0a46ac983b933b2da32230fa5e07479030015
 MD5 5cc83e3e259529faf0fd390e9d8b7d04 files/xosd-2.2.14-m4.patch 242
-MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 09060b502ee9e88b9794587d7b28c643 xosd-2.2.10.ebuild 1037
-MD5 d1b589cc120857e7f6160dffd81a9d6b xosd-2.2.14.ebuild 1734
+RMD160 fb73151d99d2f0749a2b0415bb2c07d2f139fc60 files/xosd-2.2.14-m4.patch 242
+SHA256 c6588e7f37aedaad59358bcaa3b0a46ac983b933b2da32230fa5e07479030015 files/xosd-2.2.14-m4.patch 242
+DIST xosd-2.2.10.tar.bz2 285927
+DIST xosd-2.2.8.tar.bz2 281156 RMD160 a5ec252699c03b324857ae7d1e32c6c34fe3fc6a SHA1 c8261cb6bfc957ba4a91e6b1d118d23e8180882e SHA256 5e582e6f8ec8595b743302712d595f32eac9d65bfaa4b1dcb1d01b419ff9e422
+DIST xosd-gentoo-m4-1.tar.bz2 5043
+DIST xosd_2.2.14-1.diff.gz 8616
+DIST xosd_2.2.14.orig.tar.gz 418331
+EBUILD xosd-2.2.10.ebuild 1145 RMD160 ef79f3b36c8bea6774501abc4c4fba9bca583b16 SHA1 871cec1d79540108a82738b664cc6ea5997e0720 SHA256 9cb2527bf77f8642020b81d59f3be9984812fc8e6ee9cc256a99f307a9fa5e13
+MD5 ea8f0e956f42e4e1d4cf93117de34142 xosd-2.2.10.ebuild 1145
+RMD160 ef79f3b36c8bea6774501abc4c4fba9bca583b16 xosd-2.2.10.ebuild 1145
+SHA256 9cb2527bf77f8642020b81d59f3be9984812fc8e6ee9cc256a99f307a9fa5e13 xosd-2.2.10.ebuild 1145
+EBUILD xosd-2.2.14.ebuild 1589 RMD160 7c9655d300aa34ce93332fe57aae95b31a15adaf SHA1 4d15fb3d59a1fd8a2b1502346461e1da4172944c SHA256 628ee6d775a074fa537e55d41a67469ad884deaadc4f69700da5374d0da6a26d
+MD5 eb937821360bc97a46b0d27884df00fd xosd-2.2.14.ebuild 1589
+RMD160 7c9655d300aa34ce93332fe57aae95b31a15adaf xosd-2.2.14.ebuild 1589
+SHA256 628ee6d775a074fa537e55d41a67469ad884deaadc4f69700da5374d0da6a26d xosd-2.2.14.ebuild 1589
+EBUILD xosd-2.2.8-r1.ebuild 1144 RMD160 da4d9141d90f646c6938aafbcdf21166868743bc SHA1 f22f407f4030173b79719ae1f153efc7c9f3adb2 SHA256 0217919e21f047049c5d402df32df5fdb640b088bd6618c58aa9bc7ec8174e93
 MD5 bb3a182987473e7a1274f3e7652c485c xosd-2.2.8-r1.ebuild 1144
+RMD160 da4d9141d90f646c6938aafbcdf21166868743bc xosd-2.2.8-r1.ebuild 1144
+SHA256 0217919e21f047049c5d402df32df5fdb640b088bd6618c58aa9bc7ec8174e93 xosd-2.2.8-r1.ebuild 1144
+MISC ChangeLog 6920 RMD160 54477b8f88c7d5dd843b7d48f2882f09bcec717f SHA1 ac6ffe7854e9d7ea84e7c5e72e901c31380467e4 SHA256 6410665fb8b040b6d31170399c0b5c4fb07840ddde7d49ad8a606dc18b7e576b
+MD5 50cc681f21e5a84db47778ae3013b275 ChangeLog 6920
+RMD160 54477b8f88c7d5dd843b7d48f2882f09bcec717f ChangeLog 6920
+SHA256 6410665fb8b040b6d31170399c0b5c4fb07840ddde7d49ad8a606dc18b7e576b ChangeLog 6920
+MISC metadata.xml 253 RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 SHA1 3a8933b91cfe570a857153b2774464411b845b7d SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976
+MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
+RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 metadata.xml 253
+SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976 metadata.xml 253
+MD5 c06ab555d3db962ce6e7d8bfe88940b9 files/digest-xosd-2.2.10 64
+RMD160 048e20579f68b828359e6d25e835d9bc643c3e54 files/digest-xosd-2.2.10 64
+SHA256 5458153c8affdd238fee716de9a988d5312da6c31a55f19a9c76c171f0b83e99 files/digest-xosd-2.2.10 64
+MD5 9ee14940cb0d412247cc9a15d989cd93 files/digest-xosd-2.2.14 199
+RMD160 5952be42630c9ee4758c9c69b26112b72d9f73ba files/digest-xosd-2.2.14 199
+SHA256 0332b23c8855323c74dd7b39677db3e8442692d046d4b4f835caa2d6736dded9 files/digest-xosd-2.2.14 199
+MD5 208156b10521262aa1c37677c710c9cd files/digest-xosd-2.2.8-r1 235
+RMD160 f751608b3a8f6c021f9e56e116acf41d0838d161 files/digest-xosd-2.2.8-r1 235
+SHA256 c33403732545fb95f2207b2803906b85ea3297d3a071c70fc5474bb0aefa1397 files/digest-xosd-2.2.8-r1 235
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"
 }