version bump

22 files changed, 56 insertions, 466 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index 1ba6e45f293b..f7c190c34cb5 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/xosd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.17 2003/07/29 14:40:26 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.18 2003/08/15 11:08:37 lanius Exp $
+
+*xosd-2.2.4 (15 Aug 2003)
+
+  15 Aug 2003; Heinrich Wendel <lanius@gentoo.org> metadata.xml,
+  xosd-0.7.0.ebuild, xosd-1.0.2.ebuild, xosd-2.0.0.ebuild,
+  xosd-2.0.1-r1.ebuild, xosd-2.0.1.ebuild, xosd-2.1.0.ebuild,
+  xosd-2.1.3.ebuild, xosd-2.2.2.ebuild, xosd-2.2.4.ebuild,
+  files/Makefile-gentoo.diff, files/configure-gentoo.diff:
+  version bump, cleaned out old files
 
 *xosd-2.2.2 (29 Jul 2003)
 
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index f768e8b3ea0b..b36776acca63 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,8 +1,9 @@
-MD5 fd0928cd22e936f5bbebb3e47653503f xosd-2.1.0.ebuild 879
+MD5 e4a882a5036bc137990beb929feb741e xosd-2.1.0.ebuild 880
 MD5 26f03d96fbeeb909a1ddfe597cbf1e52 xosd-2.2.2.ebuild 855
-MD5 0365d14adfb0bfab1b21935fd7d4a22d xosd-2.2.4.ebuild 972
-MD5 fcc77e741048af19952d6ee87fb121d1 ChangeLog 2380
+MD5 c8f17d4ff6c2242416002f87d7838a13 xosd-2.2.4.ebuild 972
+MD5 f59c26c67be7e99e0f76befd73a2c19e ChangeLog 2383
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 871af9ed44d16b6e7117c1c7e8c719a4 files/digest-xosd-2.1.0 62
 MD5 e814c22dfad0c632dd6f372094d043ec files/digest-xosd-2.2.2 62
 MD5 3ba5b9b17b7da4ce0b658cd8ba33a4bd files/digest-xosd-2.2.4 67
+MD5 9aeb0c049b0f220d3b8e059cecbe7db6 files/xmms_osd-2.2.4-gentoo.diff 808
diff --git a/x11-libs/xosd/files/Makefile-gentoo.diff b/x11-libs/xosd/files/Makefile-gentoo.diff
deleted file mode 100644
index a82f7b12b4eb..000000000000
--- a/x11-libs/xosd/files/Makefile-gentoo.diff
+++ /dev/null
@@ -1,85 +0,0 @@
---- Makefile.orig	2002-04-18 14:26:49.000000000 -0600
-+++ Makefile	2002-04-18 14:48:26.000000000 -0600
-@@ -5,35 +5,22 @@
- LIBRARY_VERSION=0
- VERSION=0.7.0
- 
--PREFIX=/usr/local
--EXEC_PREFIX=$(PREFIX)
--BINDIR=$(EXEC_PREFIX)/bin
--LIBDIR=$(EXEC_PREFIX)/lib
--MANDIR=$(PREFIX)/man
--INCLUDEDIR=$(PREFIX)/include
--XMMS_PLUGINDIR=$(HOME)/.xmms
--
--CC=gcc
--INSTALL=/usr/bin/install -c
--INSTALL_DATA=$(INSTALL) -m 644
--
--CFLAGS=-O2 -Wall -pipe -I. -DXOSD_VERSION=\"$(VERSION)\" -I/usr/X11R6/include
-+XOSDCFLAGS=$(CFLAGS) -I. -DXOSD_VERSION=\"$(VERSION)\" -I/usr/X11R6/include
- LDFLAGS=-L. -L/usr/X11R6/lib -lX11 -lXext -lpthread -lXt
- 
- XOSDLIBS=-lxosd
- 
--SOURCES=NEWS AUTHORS ChangeLog README COPYING Makefile testprog.c xosd.c \
--	xosd.h xmms_osd.c osd_cat.c xosd.3 osd_cat.1
-+SOURCES=xosd.c xosd.h osd_cat.c
- 
- ARFLAGS=cru
- 
--all: testprog libxosd.a libxosd.so libxmms_osd.so osd_cat
-+all: libxosd.a libxosd.so osd_cat
- 
- %.o: %.c
--	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
-+	$(CC) -c $(XOSDCFLAGS) $(CPPFLAGS) $< -o $@
- 
- %.o.pic: %.c
--	$(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ -fPIC
-+	$(CC) -c $(XOSDCFLAGS) $(CPPFLAGS) $< -o $@ -fPIC
- 
- libxosd.so: xosd.o.pic
- 	$(CC) -shared -fPIC -o $@ $+ $(LDFLAGS) \
-@@ -43,40 +30,8 @@
- 	$(AR) $(ARFLAGS) libxosd.a  $+
- 	ranlib libxosd.a
- 
--xmms_osd.o: xmms_osd.c
--	$(CC) -c -o $@ xmms_osd.c `xmms-config --cflags` -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 $(CFLAGS)
--
--libxmms_osd.so: xmms_osd.o 
--	$(CC) -shared -o $@ $+ $(LDFLAGS) `gtk-config --libs` $(XOSDLIBS)
--
--testprog: testprog.o libxosd.so
--	$(CC) -o $@ testprog.o $(LDFLAGS) $(XOSDLIBS)
--
- osd_cat: libxosd.so osd_cat.o
- 	$(CC) -o $@ osd_cat.o $(LDFLAGS) $(XOSDLIBS)
- 
--tar: xosd-$(VERSION).tar.gz
--
--xosd-$(VERSION).tar.gz:
--	ln -s . xosd-$(VERSION)
--	tar cfz $@ $(patsubst %, xosd-$(VERSION)/%, $(SOURCES))
--	rm xosd-$(VERSION)
--
--install: all
--	$(INSTALL) libxosd.so $(LIBDIR)/libxosd.so.$(LIBRARY_VERSION)
--	rm -f $(PREFIX)/lib/libxosd.so
--	ln -s $(PREFIX)/lib/libxosd.so.$(LIBRARY_VERSION) $(PREFIX)/lib/libxosd.so
--	mkdir -p $(XMMS_PLUGINDIR)/Plugins/General
--	rm -f $(XMMS_PLUGINDIR)/Plugins/General/libxmms_osd.so
--	cp -a libxmms_osd.so $(XMMS_PLUGINDIR)/Plugins/General
--	$(INSTALL) osd_cat $(BINDIR)
--	mkdir -p $(MANDIR)/man1 $(MANDIR)/man3
--	$(INSTALL_DATA) osd_cat.1 $(MANDIR)/man1/
--	$(INSTALL_DATA) xosd.3 $(MANDIR)/man3/
--
--clean:
--	rm -f *~ *.o *.o.pic xosd testprog libxosd.so libxmms_osd.so libxosd.a osd_cat
--	rm -f xosd-$(VERSION).tar.gz
--
--.PHONY: all tar clean install
-+.PHONY: all
- # vim: noexpandtab
diff --git a/x11-libs/xosd/files/configure-gentoo.diff b/x11-libs/xosd/files/configure-gentoo.diff
deleted file mode 100644
index eacb868364e8..000000000000
--- a/x11-libs/xosd/files/configure-gentoo.diff
+++ /dev/null
@@ -1,150 +0,0 @@
---- /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/x11-libs/xosd/files/digest-xosd-0.7.0 b/x11-libs/xosd/files/digest-xosd-0.7.0
deleted file mode 100644
index 75025ef747d8..000000000000
--- a/x11-libs/xosd/files/digest-xosd-0.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff80b31ea3ee52e33855b9723642b8a6 xosd-0.7.0.tar.gz 19593
diff --git a/x11-libs/xosd/files/digest-xosd-1.0.2 b/x11-libs/xosd/files/digest-xosd-1.0.2
deleted file mode 100644
index 6fc3d51ae818..000000000000
--- a/x11-libs/xosd/files/digest-xosd-1.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5d515feb604a279213171c08ce952167 xosd-1.0.2.tar.gz 221836
diff --git a/x11-libs/xosd/files/digest-xosd-2.0.0 b/x11-libs/xosd/files/digest-xosd-2.0.0
deleted file mode 100644
index 2b28c7bcf899..000000000000
--- a/x11-libs/xosd/files/digest-xosd-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd16c38ab6fe80cde6fbf21fc8d9f00c xosd-2.0.0.tar.gz 228528
diff --git a/x11-libs/xosd/files/digest-xosd-2.0.1 b/x11-libs/xosd/files/digest-xosd-2.0.1
deleted file mode 100644
index 2bf7c451beed..000000000000
--- a/x11-libs/xosd/files/digest-xosd-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5dd27d1753f639c44c87df0f0de0eae5 xosd-2.0.1.tar.gz 242579
diff --git a/x11-libs/xosd/files/digest-xosd-2.0.1-r1 b/x11-libs/xosd/files/digest-xosd-2.0.1-r1
deleted file mode 100644
index 2bf7c451beed..000000000000
--- a/x11-libs/xosd/files/digest-xosd-2.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5dd27d1753f639c44c87df0f0de0eae5 xosd-2.0.1.tar.gz 242579
diff --git a/x11-libs/xosd/files/digest-xosd-2.1.3 b/x11-libs/xosd/files/digest-xosd-2.1.3
deleted file mode 100644
index b9b4907fbdda..000000000000
--- a/x11-libs/xosd/files/digest-xosd-2.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 400315c785735d19cddaa98c78808448 xosd-2.1.3.tar.gz 290268
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.2 b/x11-libs/xosd/files/digest-xosd-2.2.2
deleted file mode 100644
index b61a1f41bbad..000000000000
--- a/x11-libs/xosd/files/digest-xosd-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b385858fb4ddeff0875fa5b4dc372e42 xosd-2.2.2.tar.gz 295184
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.4 b/x11-libs/xosd/files/digest-xosd-2.2.4
new file mode 100644
index 000000000000..18a537058d72
--- /dev/null
+++ b/x11-libs/xosd/files/digest-xosd-2.2.4
@@ -0,0 +1 @@
+MD5 0b5669d2758470cbf717632b5d16dae8 xosd_2.2.4.orig.tar.gz 295886
diff --git a/x11-libs/xosd/files/xmms_osd-2.2.4-gentoo.diff b/x11-libs/xosd/files/xmms_osd-2.2.4-gentoo.diff
new file mode 100644
index 000000000000..9398d2089422
--- /dev/null
+++ b/x11-libs/xosd/files/xmms_osd-2.2.4-gentoo.diff
@@ -0,0 +1,20 @@
+--- src/xmms_plugin/xmms_osd.c-orig	2003-07-08 10:11:20.000000000 +1200
++++ src/xmms_plugin/xmms_osd.c	2003-08-13 16:33:03.000000000 +1200
+@@ -263,6 +263,7 @@
+ 	{
+ 		xosd_set_colour (osd, colour);
+ 		xosd_set_timeout (osd, timeout);
++		xosd_set_pos (osd, pos);
+ 		xosd_set_vertical_offset (osd, offset);
+ 		xosd_set_horizontal_offset (osd, h_offset);
+ 		xosd_set_shadow_offset (osd, shadow_offset);
+--- src/xmms_plugin/xmms_osd.c-orig	2003-07-08 10:11:20.000000000 +1200
++++ src/xmms_plugin/xmms_osd.c	2003-08-13 16:34:35.000000000 +1200
+@@ -267,7 +267,6 @@
+ 		xosd_set_horizontal_offset (osd, h_offset);
+ 		xosd_set_shadow_offset (osd, shadow_offset);
+ 		xosd_set_outline_offset (osd, outline_offset);
+-		xosd_set_pos (osd, pos);
+ 		xosd_set_align (osd, align);
+ 		if (xosd_set_font (osd, font) == -1)
+ 		{
diff --git a/x11-libs/xosd/metadata.xml b/x11-libs/xosd/metadata.xml
new file mode 100644
index 000000000000..c3504b40c506
--- /dev/null
+++ b/x11-libs/xosd/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>lanius@gentoo.org</email>
+  <name>Heinrich Wendel</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/xosd/xosd-0.7.0.ebuild b/x11-libs/xosd/xosd-0.7.0.ebuild
deleted file mode 100644
index 6e72f73c56ff..000000000000
--- a/x11-libs/xosd/xosd-0.7.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-0.7.0.ebuild,v 1.11 2003/02/13 17:04:30 vapier 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"
-SLOT="0.7"
-
-DEPEND="virtual/x11"
-RDEPEND=${DEPEND}
-IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/Makefile-gentoo.diff
-}
-src_compile() {
-	make || die
-}
-src_install () {
-	cd ${S}
-	insinto /usr/include/xosd-0.7.0
-	doins xosd.h
-	into /usr
-	insinto /usr/lib/xosd-0.7.0
-	doins libxosd.a
-	doins libxosd.so
-	mv osd_cat osd_cat-old
-	dobin osd_cat-old
-	mv osd_cat.1 osd_cat-old.1
-	mv xosd.3 xosd-old.3
-	ls -l
-	doman osd_cat-old.1
-	doman xosd-old.3
-	dodoc AUTHORS ChangeLog NEWS COPYING README
-}
diff --git a/x11-libs/xosd/xosd-1.0.2.ebuild b/x11-libs/xosd/xosd-1.0.2.ebuild
deleted file mode 100644
index 4059867738e6..000000000000
--- a/x11-libs/xosd/xosd-1.0.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-1.0.2.ebuild,v 1.8 2003/02/13 17:04:36 vapier 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=""
-DEPEND="virtual/x11"
-RDEPEND=${DEPEND}
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-src_compile() {
-	econf || die
-	make || die
-}
-src_install () {
-	cd ${S}
-	insinto /usr/include
-	doins src/xosd.h
-	into /usr
-	dolib.a src/libxosd/.libs/libxosd.a
-	dolib.so src/libxosd/.libs/libxosd.so.1
-	dobin src/.libs/osd_cat
-	dobin script/xosd-config
-	doman man/*.1 man/*.3
-	dodoc AUTHORS ChangeLog NEWS COPYING README
-}
diff --git a/x11-libs/xosd/xosd-2.0.0.ebuild b/x11-libs/xosd/xosd-2.0.0.ebuild
deleted file mode 100644
index 848b5803e4da..000000000000
--- a/x11-libs/xosd/xosd-2.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 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.0.ebuild,v 1.5 2003/02/13 17:04:43 vapier 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=""
-DEPEND="virtual/x11"
-RDEPEND=${DEPEND}
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc "
-
-src_install () {
-	cd ${S}
-	insinto /usr/include
-	doins src/xosd.h
-	into /usr
-	dolib.a src/libxosd/.libs/libxosd.a
-	dolib.so src/libxosd/.libs/libxosd.so.2
-	dobin src/.libs/osd_cat
-	dobin script/xosd-config
-	doman man/*.1 man/*.3
-	dodoc AUTHORS ChangeLog NEWS COPYING README
-}
diff --git a/x11-libs/xosd/xosd-2.0.1-r1.ebuild b/x11-libs/xosd/xosd-2.0.1-r1.ebuild
deleted file mode 100644
index 88c9b4c453aa..000000000000
--- a/x11-libs/xosd/xosd-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 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.3 2003/02/13 17:04:49 vapier 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 ~ppc"
-
-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
-}
diff --git a/x11-libs/xosd/xosd-2.0.1.ebuild b/x11-libs/xosd/xosd-2.0.1.ebuild
deleted file mode 100644
index 02bc1a8c7f96..000000000000
--- a/x11-libs/xosd/xosd-2.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.2 2003/02/13 17:04:55 vapier 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=""
-DEPEND="virtual/x11"
-RDEPEND=${DEPEND}
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc "
-
-src_install () {
-	insinto /usr/include
-	doins src/xosd.h
-	into /usr
-	dolib.a src/libxosd/.libs/libxosd.a
-	dolib.so src/libxosd/.libs/libxosd.so.2
-	dobin src/.libs/osd_cat
-	dobin script/xosd-config
-	doman man/*.1 man/*.3
-	dodoc AUTHORS ChangeLog NEWS COPYING README
-}
diff --git a/x11-libs/xosd/xosd-2.1.0.ebuild b/x11-libs/xosd/xosd-2.1.0.ebuild
index 430a3d4ed467..38077e17cf8c 100644
--- a/x11-libs/xosd/xosd-2.1.0.ebuild
+++ b/x11-libs/xosd/xosd-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.1.0.ebuild,v 1.3 2003/03/08 23:13:19 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.1.0.ebuild,v 1.4 2003/08/15 11:08:37 lanius Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Library for overlaying text/glyphs in X-Windows \
@@ -13,7 +13,7 @@ DEPEND="virtual/x11
 	xmms? ( media-sound/xmms
 		media-libs/gdk-pixbuf )"
 RDEPEND=${DEPEND}
-SLOT="1"
+SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~sparc ~ppc"
 
diff --git a/x11-libs/xosd/xosd-2.1.3.ebuild b/x11-libs/xosd/xosd-2.1.3.ebuild
deleted file mode 100644
index f99ec84ef2ff..000000000000
--- a/x11-libs/xosd/xosd-2.1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.1.3.ebuild,v 1.1 2003/03/10 07:57: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 ~ppc"
-
-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
-}
diff --git a/x11-libs/xosd/xosd-2.2.2.ebuild b/x11-libs/xosd/xosd-2.2.4.ebuild
index 88798575fb1e..c6954bc63334 100644
--- a/x11-libs/xosd/xosd-2.2.2.ebuild
+++ b/x11-libs/xosd/xosd-2.2.4.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.2.ebuild,v 1.3 2003/08/13 05:49:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.4.ebuild,v 1.1 2003/08/15 11:08:37 lanius Exp $
 
 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"
+SRC_URI="http://ftp.debian.org/debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz"
 
 IUSE="xmms"
-SLOT="1"
+SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~sparc ~ppc"
 
@@ -16,16 +16,20 @@ DEPEND="virtual/x11
 	xmms? ( media-sound/xmms
 		>=media-libs/gdk-pixbuf-0.22.0 )"
 
-src_compile() {
-	local myconf
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/xmms_osd-2.2.4-gentoo.diff
+}
 
+src_compile() {
 	if [ "`use xmms`" ]; then
 		myconf="--with-plugindir=/usr/lib/xmms"
 	else
 		myconf="--without-plugindir"
 	fi
 
-	econf || die
+	econf ${myconf} || die
 	emake || die
 }