11 files changed, 201 insertions, 141 deletions
diff --git a/media-plugins/xmms-xosd/ChangeLog b/media-plugins/xmms-xosd/ChangeLog
deleted file mode 100644
index 3920aa57a530..000000000000
--- a/media-plugins/xmms-xosd/ChangeLog
+++ /dev/null
@@ -1,51 +0,0 @@
-# ChangeLog for media-plugins/xmms-xosd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-xosd/ChangeLog,v 1.5 2002/12/19 18:06:13 aliz Exp $
-
-  19 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> xmms-xosd-1.0.2, xmms-xosd-2.0.0 :
-  Lintooled.
-
-*xmms-xosd-2.0.1 (19 Dec 2002)
-
-  19 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> :
-  Version bump.
-
-*xmms-xosd-2.0.0 (05 Nov 2002)
-
-  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
-  Version bump.
-
-*xmms-xosd-1.0.2 (25 Aug 2002)
-
-  12 Sep 2002; Owen Stampflee <owen@gentoo.org> :
-  Added PPC to KEYWORDS.
-
-  30 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> xmms-xosd-1.0.2.ebuild :
-  Removed old ebuilds, digests and patches. Cleaned up ebuild for 1.0.2.
-
-  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
-
-  Relocated to media-plugins
-
-  25 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> xmms-xosd-1.0.2.ebuild
-  Version bump to keep in sync with x11-libx/xosd.
-
-*xmms-xosd-1.0.0
-
-  09 Aug 2002; J.Alberto Su�rez L. <bass@gentoo.org> xosd-1.0.0-r1.ebuild:
-  some fixes.
-
-*xmms-xosd-0.70 (08 Jun 2002)
-
-  05 Aug 2002; Nicholas Jones <carpaski@gentoo.org> xosd-0.7.0-r1.ebuild
-
-  SRC_URI typo fix
-
-*xmms-xosd-0.70 (08 Jun 2002)
-
-  08 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> xmms-xosd-0.70.ebuild:
-  Fixed file to download and $S.
-
-  04 Jun 2002; J.Alberto Su�rez L. <bass@gentoo.org> xosd-0.70.ebuild:
-		
-  First relase courtesy of Stacey Keast <slik@telusplanet.net>
diff --git a/media-plugins/xmms-xosd/files/digest-xmms-xosd-1.0.2 b/media-plugins/xmms-xosd/files/digest-xmms-xosd-1.0.2
deleted file mode 100644
index 6fc3d51ae818..000000000000
--- a/media-plugins/xmms-xosd/files/digest-xmms-xosd-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5d515feb604a279213171c08ce952167 xosd-1.0.2.tar.gz 221836
diff --git a/media-plugins/xmms-xosd/files/digest-xmms-xosd-2.0.0 b/media-plugins/xmms-xosd/files/digest-xmms-xosd-2.0.0
deleted file mode 100644
index 2b28c7bcf899..000000000000
--- a/media-plugins/xmms-xosd/files/digest-xmms-xosd-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd16c38ab6fe80cde6fbf21fc8d9f00c xosd-2.0.0.tar.gz 228528
diff --git a/media-plugins/xmms-xosd/xmms-xosd-1.0.2.ebuild b/media-plugins/xmms-xosd/xmms-xosd-1.0.2.ebuild
deleted file mode 100644
index 89842f40397b..000000000000
--- a/media-plugins/xmms-xosd/xmms-xosd-1.0.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-xosd/xmms-xosd-1.0.2.ebuild,v 1.7 2002/12/19 18:06:13 aliz Exp $
-
-MY_P=${PN/xmms-}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="xmms plugin for overlaying song titles in X-Windows - X-On-Screen-Display"
-SRC_URI="http://www.ignavus.net/${MY_P}.tar.gz"
-HOMEPAGE="http://www.ignavus.net/software.html"
-
-IUSE=""
-DEPEND="virtual/x11
-	virtual/glibc
-	>=media-sound/xmms-1.2.6-r1
-	>=x11-libs/xosd-1.0.2"
-RDEPEND=${DEPEND}
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-src_compile() {
-	econf || die
-	make || die
-}
-
-src_install () {
-	cd ${S}
-	insinto /usr/lib/xmms/General
-	doins src/xmms_plugin/.libs/libxmms_osd.so src/xmms_plugin/.libs/libxmms_osd.so.0 \
-		src/xmms_plugin/.libs/libxmms_osd.so.0.0.0
-	fperms 0755 /usr/lib/xmms/General/libxmms_osd.so
-	fperms 0755 /usr/lib/xmms/General/libxmms_osd.so.0
-	fperms 0755 /usr/lib/xmms/General/libxmms_osd.so.0.0.0
-	into /usr
-	dodoc AUTHORS ChangeLog COPYING README
-}
diff --git a/media-plugins/xmms-xosd/xmms-xosd-2.0.0.ebuild b/media-plugins/xmms-xosd/xmms-xosd-2.0.0.ebuild
deleted file mode 100644
index 1cf735017590..000000000000
--- a/media-plugins/xmms-xosd/xmms-xosd-2.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-xosd/xmms-xosd-2.0.0.ebuild,v 1.2 2002/12/19 18:06:13 aliz Exp $
-
-MY_P=${PN/xmms-}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="xmms plugin for overlaying song titles in X-Windows - X-On-Screen-Display"
-SRC_URI="http://www.ignavus.net/${MY_P}.tar.gz"
-HOMEPAGE="http://www.ignavus.net/software.html"
-
-IUSE=""
-DEPEND="virtual/x11
-	virtual/glibc
-	>=media-sound/xmms-1.2.6-r1
-	=x11-libs/xosd-2.0.0"
-RDEPEND=${DEPEND}
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-src_install () {
-	insinto /usr/lib/xmms/General
-	doins src/xmms_plugin/.libs/libxmms_osd.so
-	fperms 0755 /usr/lib/xmms/General/libxmms_osd.so
-	dodoc AUTHORS ChangeLog COPYING README
-}
diff --git a/media-plugins/xmms-xosd/xmms-xosd-2.0.1.ebuild b/media-plugins/xmms-xosd/xmms-xosd-2.0.1.ebuild
deleted file mode 100644
index a8e601eecd1f..000000000000
--- a/media-plugins/xmms-xosd/xmms-xosd-2.0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-xosd/xmms-xosd-2.0.1.ebuild,v 1.2 2003/01/01 04:36:04 vapier Exp $
-
-MY_P=${PN/xmms-}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="xmms plugin for overlaying song titles in X-Windows - X-On-Screen-Display"
-SRC_URI="http://www.ignavus.net/${MY_P}.tar.gz"
-HOMEPAGE="http://www.ignavus.net/software.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-DEPEND="virtual/x11
-	virtual/glibc
-	>=media-sound/xmms-1.2.6-r1
-	~x11-libs/xosd-${PV}"
-
-src_install() {
-	insinto /usr/lib/xmms/General
-	doins src/xmms_plugin/.libs/libxmms_osd.so
-	fperms 0755 /usr/lib/xmms/General/libxmms_osd.so
-	dodoc AUTHORS ChangeLog COPYING README
-}
diff --git a/profiles/updates/1Q-2003 b/profiles/updates/1Q-2003
index 8d83b4d8506a..c6c19f026314 100644
--- a/profiles/updates/1Q-2003
+++ b/profiles/updates/1Q-2003
@@ -1 +1,2 @@
 move net-misc/fwbuilder net-firewall/fwbuilder
+move media-plugins/xmms-xosd x11-libs/xosd
diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index 25bce4335c11..5056ae8ef8d2 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/xosd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.11 2002/12/19 18:06:13 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.12 2003/01/08 09:32:05 aliz Exp $
+
+*xosd-2.0.1-r1 (07 Jan 2003)
+
+  07 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> xosd-2.0.1-r1.ebuild :
+  Fix for #12519. Moved installation of xmms plugin to this ebuild instead of media-plugins/xmms-xosd.
+  Fixed installation function.
 
 *xosd-2.0.1 (19 Dec 2002)
 
diff --git a/x11-libs/xosd/files/configure-gentoo.diff b/x11-libs/xosd/files/configure-gentoo.diff
new file mode 100644
index 000000000000..eacb868364e8
--- /dev/null
+++ b/x11-libs/xosd/files/configure-gentoo.diff
@@ -0,0 +1,150 @@
+--- /tmp/configure	2003-01-07 14:01:03.000000000 +0100
++++ configure	2003-01-07 14:08:33.000000000 +0100
+@@ -7021,19 +7021,19 @@
+ 
+ SELECTED_PLUGINS=
+ 
+-# Extract the first word of "xmms-config", so it can be a program name with args.
+-set dummy xmms-config; ac_word=$2
++# Extract the first word of "gdk-pixbuf-config", so it can be a program name with args.
++set dummy gdk-pixbuf-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:7028: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_xmms_config_script'+set}'`\" = set"; then
++echo "configure:7083: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_gdk_pixbuf_config_script'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  case "$xmms_config_script" in
++  case "$gdk_pixbuf_config_script" in
+   /*)
+-  ac_cv_path_xmms_config_script="$xmms_config_script" # Let the user override the test with a path.
++  ac_cv_path_gdk_pixbuf_config_script="$gdk_pixbuf_config_script" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+-  ac_cv_path_xmms_config_script="$xmms_config_script" # Let the user override the test with a dos path.
++  ac_cv_path_gdk_pixbuf_config_script="$gdk_pixbuf_config_script" # Let the user override the test with a dos path.
+   ;;
+   *)
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+@@ -7041,54 +7041,37 @@
+   for ac_dir in $ac_dummy; do 
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_xmms_config_script="$ac_dir/$ac_word"
++      ac_cv_path_gdk_pixbuf_config_script="$ac_dir/$ac_word"
+       break
+     fi
+   done
+   IFS="$ac_save_ifs"
+-  test -z "$ac_cv_path_xmms_config_script" && ac_cv_path_xmms_config_script=""none""
++  test -z "$ac_cv_path_gdk_pixbuf_config_script" && ac_cv_path_gdk_pixbuf_config_script=""none""
+   ;;
+ esac
+ fi
+-xmms_config_script="$ac_cv_path_xmms_config_script"
+-if test -n "$xmms_config_script"; then
+-  echo "$ac_t""$xmms_config_script" 1>&6
++gdk_pixbuf_config_script="$ac_cv_path_gdk_pixbuf_config_script"
++if test -n "$gdk_pixbuf_config_script"; then
++  echo "$ac_t""$gdk_pixbuf_config_script" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-if test "x$xmms_config_script" = "xnone" ; then
+-	echo "*** xmms-config script not found. xmms plugin will not be built"
+-else
+-	XMMS_CFLAGS=`$xmms_config_script --cflags`
+-	XMMS_LIBS=`$xmms_config_script --libs`
+-	echo $ac_n "checking for xmms plugin directory""... $ac_c" 1>&6
+-echo "configure:7067: checking for xmms plugin directory" >&5
+-	if test "x$XMMS_PLUGIN_DIR" = "x" ; then
+-		XMMS_PLUGIN_DIR=`$xmms_config_script --general-plugin-dir`
+-	fi
+-	echo "$ac_t""$XMMS_PLUGIN_DIR" 1>&6
+-	
+-	
+-	
+-	SELECTED_PLUGINS="$SELECTED_PLUGINS xmms_plugin"
+-fi
+ 
+ 
+-
+-# Extract the first word of "gdk-pixbuf-config", so it can be a program name with args.
+-set dummy gdk-pixbuf-config; ac_word=$2
++# Extract the first word of "xmms-config", so it can be a program name with args.
++set dummy xmms-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:7083: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_gdk_pixbuf_config_script'+set}'`\" = set"; then
++echo "configure:7028: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_xmms_config_script'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  case "$gdk_pixbuf_config_script" in
++  case "$xmms_config_script" in
+   /*)
+-  ac_cv_path_gdk_pixbuf_config_script="$gdk_pixbuf_config_script" # Let the user override the test with a path.
++  ac_cv_path_xmms_config_script="$xmms_config_script" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+-  ac_cv_path_gdk_pixbuf_config_script="$gdk_pixbuf_config_script" # Let the user override the test with a dos path.
++  ac_cv_path_xmms_config_script="$xmms_config_script" # Let the user override the test with a dos path.
+   ;;
+   *)
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+@@ -7096,24 +7079,46 @@
+   for ac_dir in $ac_dummy; do 
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+-      ac_cv_path_gdk_pixbuf_config_script="$ac_dir/$ac_word"
++      ac_cv_path_xmms_config_script="$ac_dir/$ac_word"
+       break
+     fi
+   done
+   IFS="$ac_save_ifs"
+-  test -z "$ac_cv_path_gdk_pixbuf_config_script" && ac_cv_path_gdk_pixbuf_config_script=""none""
++  test -z "$ac_cv_path_xmms_config_script" && ac_cv_path_xmms_config_script=""none""
+   ;;
+ esac
+ fi
+-gdk_pixbuf_config_script="$ac_cv_path_gdk_pixbuf_config_script"
+-if test -n "$gdk_pixbuf_config_script"; then
+-  echo "$ac_t""$gdk_pixbuf_config_script" 1>&6
++xmms_config_script="$ac_cv_path_xmms_config_script"
++if test -n "$xmms_config_script"; then
++  echo "$ac_t""$xmms_config_script" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-GDK_PIXBUF_CFLAGS=`$gdk_pixbuf_config_script --cflags`
+-GDK_PIXBUF_LIBS=`$gdk_pixbuf_config_script --libs`
++if test "x$xmms_config_script" = "xnone" || test "x$gdk_pixbuf_config_script" = "xnone" ; then
++        echo "*** xmms-config script not found. xmms plugin will not be built"
++else
++        XMMS_CFLAGS=`$xmms_config_script --cflags`
++        XMMS_LIBS=`$xmms_config_script --libs`
++
++	GDK_PIXBUF_CFLAGS=`$gdk_pixbuf_config_script --cflags`
++	GDK_PIXBUF_LIBS=`$gdk_pixbuf_config_script --libs`
++
++        echo $ac_n "checking for xmms plugin directory""... $ac_c" 1>&6
++	echo "configure:7067: checking for xmms plugin directory" >&5
++        if test "x$XMMS_PLUGIN_DIR" = "x" ; then
++                XMMS_PLUGIN_DIR=`$xmms_config_script --general-plugin-dir`
++        fi
++        echo "$ac_t""$XMMS_PLUGIN_DIR" 1>&6
++
++
++
++        SELECTED_PLUGINS="$SELECTED_PLUGINS xmms_plugin"
++fi
++
++
++
++
+ 
+ 
+ 
diff --git a/media-plugins/xmms-xosd/files/digest-xmms-xosd-2.0.1 b/x11-libs/xosd/files/digest-xosd-2.0.1-r1
index 2bf7c451beed..2bf7c451beed 100644
--- a/media-plugins/xmms-xosd/files/digest-xmms-xosd-2.0.1
+++ b/x11-libs/xosd/files/digest-xosd-2.0.1-r1
diff --git a/x11-libs/xosd/xosd-2.0.1-r1.ebuild b/x11-libs/xosd/xosd-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..d7479a3370ff
--- /dev/null
+++ b/x11-libs/xosd/xosd-2.0.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.0.1-r1.ebuild,v 1.1 2003/01/08 09:32:05 aliz Exp $
+
+S=${WORKDIR}/${P}
+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.gz"
+
+IUSE="xmms"
+DEPEND="virtual/x11
+	xmms? ( media-sound/xmms
+		media-libs/gdk-pixbuf )"
+RDEPEND=${DEPEND}
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~sparc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	patch -p0 < ${FILESDIR}/configure-gentoo.diff || die
+}
+
+src_compile() {
+	local myconf
+
+	if [ "`use xmms`" ]; then
+		myconf="--with-plugindir=/usr/lib/xmms"
+	else
+		myconf="--without-plugindir"
+	fi
+
+	econf || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog NEWS COPYING README
+}