revbump + modular X fixes

(Portage version: 2.1)
 (Unsigned Manifest commit)

4 files changed, 22 insertions, 477 deletions

diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index 6b924879f4c8..16782cc0edb3 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -6,45 +6,41 @@ AUX bmp-dlg_config.patch 403 RMD160 40ec201fe3edf3155c4c9d3dfdc8d30323287446 SHA
 MD5 1132764268b2645df6a9a3ba6bf06e4d files/bmp-dlg_config.patch 403
 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
 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.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
-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
+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 1148 RMD160 c60e030e4c9bf51ef58f57fcd32a9d7b74383997 SHA1 99a055ab657101b7d4bea050f1c733fdb7a80d7d SHA256 d9ba278cbb7e7e980b19cc5bfb88871a9665739ec945b53f490977b677bdc269
+MD5 3876d1b39d18c16520377ca8a86cb377 xosd-2.2.10-r1.ebuild 1148
+RMD160 c60e030e4c9bf51ef58f57fcd32a9d7b74383997 xosd-2.2.10-r1.ebuild 1148
+SHA256 d9ba278cbb7e7e980b19cc5bfb88871a9665739ec945b53f490977b677bdc269 xosd-2.2.10-r1.ebuild 1148
+EBUILD xosd-2.2.14-r1.ebuild 1592 RMD160 d57426baddc6590c4a8b23e70fa4e2b9f2635a02 SHA1 655d1a18e5d5f1ef3f0a701c859eec1296df9d28 SHA256 2641ac825cfaff25b8d90cf191eb8000759ec225d6e6b006b04d58dc0879b677
+MD5 9c21d776bfa949b0bff49d06c7405514 xosd-2.2.14-r1.ebuild 1592
+RMD160 d57426baddc6590c4a8b23e70fa4e2b9f2635a02 xosd-2.2.14-r1.ebuild 1592
+SHA256 2641ac825cfaff25b8d90cf191eb8000759ec225d6e6b006b04d58dc0879b677 xosd-2.2.14-r1.ebuild 1592
 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 ChangeLog 7183 RMD160 45edaecb3c204912dd1c732aef32a47c2607579d SHA1 4a5fc38f3b078b62d7d81892be8505ab063f118b SHA256 ffda227a26187c13ab4d0eb1eb99832464e7b39413db1684728830222f475f09
+MD5 bddd9dce6f75525b24ba7c72d33ef3ec ChangeLog 7183
+RMD160 45edaecb3c204912dd1c732aef32a47c2607579d ChangeLog 7183
+SHA256 ffda227a26187c13ab4d0eb1eb99832464e7b39413db1684728830222f475f09 ChangeLog 7183
 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 cebce4639188a76393ade218de4687f6 files/digest-xosd-2.2.10-r1 238
+RMD160 be8ab2e33688258c001f7f544bef9a2baed7abb2 files/digest-xosd-2.2.10-r1 238
+SHA256 d063bc0c224e9819431b58809cd87bebc675ebed8d908fb222c154531509c9a8 files/digest-xosd-2.2.10-r1 238
+MD5 5b39bdc481e1e96fd3f845c21ef3c074 files/digest-xosd-2.2.14-r1 735
+RMD160 060c641e9578cc7ed63e90f39caa5e3647572aca files/digest-xosd-2.2.14-r1 735
+SHA256 fc3379b0260e5442b662c7dc62da55479b06ddf09b1377fa93b613129fad013f files/digest-xosd-2.2.14-r1 735
 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/xosd-2.2.14-bmp-fixes.patch b/x11-libs/xosd/files/xosd-2.2.14-bmp-fixes.patch
deleted file mode 100644
index cfe8a25e6860..000000000000
--- a/x11-libs/xosd/files/xosd-2.2.14-bmp-fixes.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-Patch to fix support for beep-media-player
-* BMP (old and new) and XMMS (old) does not require gdk-pixbuf; XMMS (new) however does.
-* Fail when errors are detected rather than silently do what we can do.
-* Make it possible to build BMP new/old and XMMS new/old independently
-
-diff -Naur xosd-2.2.14.orig/aclocal.m4 xosd-2.2.14/aclocal.m4
---- xosd-2.2.14.orig/aclocal.m4	2005-03-28 02:57:08.000000000 +0200
-+++ xosd-2.2.14/aclocal.m4	2005-03-28 04:20:12.000000000 +0200
-@@ -1,5 +1,4 @@
--# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
--
-+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
- # Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
-@@ -6534,7 +6533,7 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.2])])
-+	 [AM_AUTOMAKE_VERSION([1.9.5])])
- 
- # AM_AUX_DIR_EXPAND
- 
-diff -Naur xosd-2.2.14.orig/configure.ac xosd-2.2.14/configure.ac
---- xosd-2.2.14.orig/configure.ac	2004-11-17 20:29:58.000000000 +0100
-+++ xosd-2.2.14/configure.ac	2005-03-28 16:46:20.000000000 +0200
-@@ -22,9 +22,9 @@
- dnl    LT_REVISION = 0;
- dnl    LT_CURRENT ++;
- dnl    if (any interfaces have been _added_ since last release)
--dnl       AGE ++;
-+dnl		  AGE ++;
- dnl    if (any interfaces have been _removed_ or _incompatibly changed_)
--dnl       AGE = 0;
-+dnl		  AGE = 0;
- dnl }
- LT_CURRENT=4
- LT_AGE=2
-@@ -43,7 +43,7 @@
- AM_PROG_LIBTOOL
- AC_PATH_XTRA([X11],[X11/Xlib.h],[XrmInitialize()])
- # We need two libtools, one that builds both shared and static, and
--# one that builds only static.  This is because the resulting libtool
-+# one that builds only static.	This is because the resulting libtool
- # does not allow us to choose which to build at runtime.
- sed -e 's/^build_old_libs=yes/build_old_libs=no/' libtool > libtool-disable-static
- chmod +x libtool-disable-static
-@@ -55,13 +55,13 @@
- 
- dnl Checks for libraries.
- AM_PATH_GTK(1.2.2,,
--	    AC_MSG_WARN([*** GTK+ >= 1.2.2 not found ***]))
-+		AC_MSG_WARN([*** GTK+ >= 1.2.2 not found ***]))
- AC_CHECK_LIB(X11, XInitThreads,,
--	     AC_MSG_ERROR([*** X11 not threadsafe ***]))
-+		 AC_MSG_ERROR([*** X11 not threadsafe ***]))
- AC_CHECK_LIB(Xext, XShapeQueryExtension,,
--	     AC_MSG_ERROR([*** X11 Shape extension not found ***]))
-+		 AC_MSG_ERROR([*** X11 Shape extension not found ***]))
- AC_CHECK_LIB(pthread, pthread_create,,
--	     AC_MSG_ERROR([*** POSIX thread support not found ***]))
-+		 AC_MSG_ERROR([*** POSIX thread support not found ***]))
- 
- dnl Check for header files.
- AC_HEADER_STDC
-@@ -76,101 +76,149 @@
- 
- # nicked from the irmix project...
- AC_ARG_ENABLE([xinerama],
--              AC_HELP_STRING([--disable-xinerama],
--			     [disable use of Xinerama extension]),
--              [disable_xinerama="yes"],
--	      [disable_xinerama="no"])
-+			  AC_HELP_STRING([--disable-xinerama],
-+				 [disable use of Xinerama extension]),
-+			  [disable_xinerama="yes"],
-+		  [disable_xinerama="no"])
- 
- if test x$disable_xinerama = "xno"
- then
--        AC_CHECK_LIB(Xinerama_pic,
--                     XineramaQueryExtension,
--                     [X_LIBS="$X_LIBS -lXinerama_pic"
--                      AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
--                      ac_have_xinerama="yes"],
--                      AC_CHECK_LIB(Xinerama,
--                                   XineramaQueryExtension,
--                                   [X_LIBS="$X_LIBS -lXinerama"
--                                    AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama
-+		AC_CHECK_LIB(Xinerama_pic,
-+					 XineramaQueryExtension,
-+					 [X_LIBS="$X_LIBS -lXinerama_pic"
-+					  AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama installed])
-+					  ac_have_xinerama="yes"],
-+					  AC_CHECK_LIB(Xinerama,
-+								   XineramaQueryExtension,
-+								   [X_LIBS="$X_LIBS -lXinerama"
-+									AC_DEFINE(HAVE_XINERAMA,1,[Define this if you have libXinerama
- installed])
--                                    ac_have_xinerama="yes"],,
--                                    [$X_LIBS -lXext $X_EXTRA_LIBS]),
--                     [$X_LIBS -lXext $X_EXTRA_LIBS])
-+									ac_have_xinerama="yes"],,
-+									[$X_LIBS -lXext $X_EXTRA_LIBS]),
-+					 [$X_LIBS -lXext $X_EXTRA_LIBS])
- fi
- 
-+dnl Check if beep-media-player is available
- if pkg-config --exists bmp
- then
- 	PKG_CHECK_MODULES(BMP, bmp)
- 	BMP_GENERAL_PLUGIN_DIR=$(pkg-config --variable general_plugin_dir bmp)
- 	AC_SUBST(BMP_GENERAL_PLUGIN_DIR)
--	no_bmp="yes"
-+	no_bmp="no"
- else
--	no_bmp="no"	
-+	no_bmp="yes"
- 	AC_MSG_WARN("beep media player not found")
- fi
- 
--
--
--
- dnl Check for xmms
- AM_PATH_XMMS(1.2.7,,
--	     AC_MSG_WARN("xmms plugins can not be built"))
-+		 AC_MSG_WARN("xmms plugins can not be built"))
-+
- dnl Override where to place libxmms_xosd.so
- AC_ARG_WITH([plugindir],
--            AC_HELP_STRING([--with-plugindir=DIR],
-+			AC_HELP_STRING([--with-plugindir=DIR],
- 			   [Set the xmms plugin directory]),
--            [XMMS_PLUGIN_DIR="$withval"],
--            [XMMS_PLUGIN_DIR="$XMMS_GENERAL_PLUGIN_DIR"])
-+			[XMMS_PLUGIN_DIR="$withval"],
-+			[XMMS_PLUGIN_DIR="$XMMS_GENERAL_PLUGIN_DIR"])
- 
- dnl Check for gdk-pixbuf
- AM_PATH_GDK_PIXBUF(0.22.0,,
- 		   AC_MSG_WARN("new xmms plugin can not be built"))
-+
- dnl Override where to place pixmaps for libxmms_xosd.so
- AC_ARG_WITH([pixmapdir],
--	    AC_HELP_STRING([--with-pixmapdir=DIR],
--			   [Set the directory for xmms plugin pixmaps]),
--            [XMMS_PIXMAPDIR="$withval"],
--            [XMMS_PIXMAPDIR="${datadir}/xosd"])
-+		AC_HELP_STRING([--with-pixmapdir=DIR],
-+				[Set the directory for xmms plugin pixmaps]),
-+			[XMMS_PIXMAPDIR="$withval"],
-+		[XMMS_PIXMAPDIR="${datadir}/xosd"])
-+
- AC_SUBST(XMMS_PIXMAPDIR)
- 
--dnl NEW plugin
--AC_ARG_ENABLE([new-plugin],
--	      AC_HELP_STRING([--disable-new-plugin],
--			     [Disable new xmms plugin (enabled by default)]),
--              [enable_new_plugin="$enableval"],
--	      [enable_new_plugin="yes"])
-+dnl XMMS PLUGINS
-+dnl new xmms
-+AC_ARG_ENABLE([new-xmms],
-+		  AC_HELP_STRING([--disable-new-xmms],
-+				 [Disable new xmms plugin (enabled by default)]),
-+			[enable_new_xmms="$enableval"],
-+		  [enable_new_xmms="yes"])
-+
-+dnl old xmms
-+AC_ARG_ENABLE([old-xmms],
-+		  AC_HELP_STRING([--enable-old-xmms],
-+				[Enable old xmms plugin (disabled by default)]),
-+			[enable_old_xmms="$enableval"],
-+		  [enable_old_xmms="no"])
-+
-+
-+dnl BEEP-MEDIA-PLAYER PLUGINS
-+dnl new bmp
-+AC_ARG_ENABLE([new-bmp],
-+		AC_HELP_STRING([--disable-new-bmp],
-+				[Disable new beep media plugin (enabled by default)]),
-+			[enable_new_bmp="$enableval"],
-+		  [enable_new_bmp="yes"])
-+dnl old bmp
-+AC_ARG_ENABLE([old-bmp],
-+		  AC_HELP_STRING([--enable-old-bmp],
-+				[Enable old bmp plugin (disabled by default)]),
-+			[enable_old_bmp="$enableval"],
-+		  [enable_old_bmp="no"])
-+
-+dnl CHECK PLUGINS
-+dnl beep media player
-+dnl new
-+AC_MSG_CHECKING([whether new beep media plugin was requested])
-+if test x"$enable_new_bmp" == "xyes"
-+then
-+	test x"$no_bmp" == "xyes" && AC_MSG_ERROR([yes, but cannot be built])
-+	AC_MSG_RESULT([yes])
-+else
-+	AC_MSG_RESULT([no])
-+fi
-+AM_CONDITIONAL([BUILD_BEEP_NEW_PLUGIN],
-+		   [test x"$enable_new_bmp" = "xyes"])
-+dnl old
-+AC_MSG_CHECKING([whether old beep media plugin was requested])
-+if test x"$enable_old_bmp" == "xyes"
-+then
-+	test x"$no_bmp" == "xyes" && AC_MSG_ERROR([yes, but cannot be built])
-+	AC_MSG_RESULT([yes])
-+else
-+	AC_MSG_RESULT([no])
-+fi
-+AM_CONDITIONAL([BUILD_BEEP_OLD_PLUGIN],
-+		   [test x"$enable_old_bmp" = "xyes"])
-+
-+dnl XMMS 
-+dnl new 
- AC_MSG_CHECKING([whether new xmms plugin was requested])
--AC_MSG_RESULT($enable_new_plugin)
-+if test x"$enable_new_xmms" == "xyes"
-+then
-+	if test x"$no_xmms" == "xyes" -o x"$no_gdk_pixbuf" == "xyes"
-+	then
-+		AC_MSG_ERROR([yes, but cannot be built])
-+	fi
-+	AC_MSG_RESULT([yes])
-+else
-+	AC_MSG_RESULT([no])
-+fi
- AM_CONDITIONAL([BUILD_NEW_PLUGIN],
--	       [test x"$enable_new_plugin" = "xyes" -a x"$no_xmms" != "xyes" -a x"$no_gdk_pixbuf" != "xyes"])
-+		   [test x"$enable_new_xmms" = "xyes"])
- 
--
--dnl Check for Beep Media player
--AC_ARG_ENABLE([beep_media_player_plugin],
--		AC_HELP_STRING([--enable-beep_media_player_plugin],
--			     [Enable beep media plugin (enabled by default)]),
--              [beep_media_player_plugin="$enableval"],
--              [beep_media_player_plugin="yes"])
--AC_MSG_CHECKING([whether beep media plugin was requested])
--AC_MSG_RESULT($beep_media_player_plugin)
--
--AM_CONDITIONAL([BUILD_BEEP_MEDIA_PLUGIN],
--	       [test x"$beep_media_player_plugin" = "xyes" -a x"$no_bmp" == "xyes"])
--
--		
--
--
--dnl OLD plugin
--AC_ARG_ENABLE([old-plugin],
--	      AC_HELP_STRING([--enable-old-plugin],
--			     [Enable old xmms plugin (disabled by default)]),
--              [enable_old_plugin="$enableval"],
--              [enable_old_plugin="no"])
-+dnl old
- AC_MSG_CHECKING([whether old xmms plugin was requested])
--AC_MSG_RESULT($enable_old_plugin)
-+if test x"$enable_old_xmms" = "xyes"
-+then
-+	if test x"$no_xmms" == "xyes"
-+	then
-+		AC_MSG_ERROR([yes, but cannot be built])
-+	fi
-+	AC_MSG_RESULT([yes])
-+else
-+	AC_MSG_RESULT([no])
-+fi
- AM_CONDITIONAL([BUILD_OLD_PLUGIN],
--	       [test x"$enable_old_plugin" = "xyes" -a x"$no_xmms" != "xyes"])
--
-+		   [test x"$enable_old_xmms" = "xyes"])
- 
- dnl Define XOSD_VERSION
- AC_DEFINE_UNQUOTED(XOSD_VERSION, "${VERSION}")
-diff -Naur xosd-2.2.14.orig/src/bmp_plugin/Makefile.am xosd-2.2.14/src/bmp_plugin/Makefile.am
---- xosd-2.2.14.orig/src/bmp_plugin/Makefile.am	2005-03-28 16:56:28.000000000 +0200
-+++ xosd-2.2.14/src/bmp_plugin/Makefile.am	2005-03-28 16:56:50.000000000 +0200
-@@ -7,14 +7,12 @@
- # Don't build a static library
- LIBTOOL = $(top_builddir)/libtool-disable-static
- 
--if BUILD_BEEP_MEDIA_PLUGIN
--if BUILD_NEW_PLUGIN
-+if BUILD_BEEP_NEW_PLUGIN
- NEW_bmpplugin = libbmp_osd.la
- endif
--if BUILD_OLD_PLUGIN
-+if BUILD_BEEP_OLD_PLUGIN
- OLD_bmpplugin = libbmp_osd_old.la
- endif
--endif
- 
- bmpplugin_LTLIBRARIES = $(NEW_bmpplugin) $(OLD_bmpplugin)
- 
-diff -Naur xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c xosd-2.2.14/src/bmp_plugin/bmp_osd.c
---- xosd-2.2.14.orig/src/bmp_plugin/bmp_osd.c	2004-11-17 20:26:56.000000000 +0100
-+++ xosd-2.2.14/src/bmp_plugin/bmp_osd.c	2005-03-28 17:53:27.000000000 +0200
-@@ -22,9 +22,9 @@
- 
- #include "bmp_osd.h"
- 
--#include <xmms/plugin.h>
--#include <xmms/xmmsctrl.h>
--#include <xmms/configfile.h>
-+#include <bmp/plugin.h>
-+#include <bmp/beepctrl.h>
-+#include <bmp/configfile.h>
- 
- static void init(void);
- static void cleanup(void);
-diff -Naur xosd-2.2.14.orig/src/bmp_plugin/dlg_config.c xosd-2.2.14/src/bmp_plugin/dlg_config.c
---- xosd-2.2.14.orig/src/bmp_plugin/dlg_config.c	2004-11-08 21:03:23.000000000 +0100
-+++ xosd-2.2.14/src/bmp_plugin/dlg_config.c	2005-03-28 17:53:27.000000000 +0200
-@@ -22,7 +22,7 @@
- 
- #include "bmp_osd.h"
- 
--#include <xmms/configfile.h>
-+#include <bmp/configfile.h>
- 
- static GtkToggleButton
-   * vol_on, *bal_on,
-diff -Naur xosd-2.2.14.orig/src/bmp_plugin/dlg_config_old.c xosd-2.2.14/src/bmp_plugin/dlg_config_old.c
---- xosd-2.2.14.orig/src/bmp_plugin/dlg_config_old.c	2004-11-08 21:03:23.000000000 +0100
-+++ xosd-2.2.14/src/bmp_plugin/dlg_config_old.c	2005-03-28 17:53:27.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- #include "bmp_osd.h"
- 
--#include <xmms/configfile.h>
-+#include <bmp/configfile.h>
- 
- static GtkToggleButton
-   * vol_on, *bal_on,
diff --git a/x11-libs/xosd/xosd-2.2.10.ebuild b/x11-libs/xosd/xosd-2.2.10.ebuild
deleted file mode 100644
index f9363afa1e3e..000000000000
--- a/x11-libs/xosd/xosd-2.2.10.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.4 2006/06/11 19:59:52 antarus 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.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 )
-	virtual/x11 )
-	xmms? ( media-sound/xmms >=media-libs/gdk-pixbuf-0.22.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/2.2.8-xmms-trackpos.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	use xinerama || myconf="${myconf} --disable-xinerama"
-
-	use xmms || 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.ebuild b/x11-libs/xosd/xosd-2.2.14.ebuild
deleted file mode 100644
index e1464aff50b4..000000000000
--- a/x11-libs/xosd/xosd-2.2.14.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.8 2006/06/11 19:59:52 antarus Exp $
-
-inherit eutils
-
-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
-	mirror://debian/pool/main/x/xosd/${PN}_${PV}-1.diff.gz
-	http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="xinerama xmms"
-
-RDEPEND="|| ( ( x11-libs/libX11
-	x11-libs/libXext )
-	virtual/x11 )
-	xmms? (
-		media-sound/xmms
-		>=media-libs/gdk-pixbuf-0.22.0
-	)"
-
-DEPEND="|| ( (
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xproto )
-	virtual/x11 )
-	${RDEPEND}
-	>=sys-devel/autoconf-2.57
-	>=sys-devel/automake-1.8"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/2.2.8-xmms-trackpos.patch
-	epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
-
-	export WANT_AUTOMAKE=1.8
-	export WANT_AUTOCONF=2.5
-	libtoolize --force --copy || die
-	aclocal -I ${WORKDIR}/m4 || die
-	automake -a -f -c || die
-	autoconf || die
-}
-
-src_compile() {
-	econf \
-		`use_enable xinerama` \
-		`use_enable xmms new-xmms` \
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS COPYING README TODO
-}