version bump

(Portage version: 2.0.51.19)

8 files changed, 23 insertions, 206 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index b80784cfda39..2c750ec60ecc 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.43 2005/02/25 16:56:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.44 2005/03/25 11:46:20 lanius Exp $
+
+*xosd-2.2.14 (25 Mar 2005)
+
+  25 Mar 2005; Heinrich Wendel <lanius@gentoo.org>
+  -files/2.2.5-xmms-trackpos.patch, -xosd-2.2.12.ebuild, +xosd-2.2.14.ebuild,
+  -xosd-2.2.5-r1.ebuild:
+  version bump
 
 *xosd-2.2.10 (25 Feb 2005)
 
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index b78401ec0f08..4465f6c23509 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,13 +1,10 @@
 MD5 d7576ed293b4158de9a3ce70e994edf0 xosd-2.2.8-r1.ebuild 1037
-MD5 8a093186720d8ae1aba4624acea05ef4 xosd-2.2.12.ebuild 2552
+MD5 a2ab7a10a72823f384a0d6f3506eb4cf xosd-2.2.14.ebuild 1260
 MD5 70256c3731c8aacb4765baaf6b437cb9 ChangeLog 5633
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 19f54462a6e90e84750f3eafeb8a9cc0 xosd-2.2.5-r1.ebuild 1035
 MD5 3f2b043bcd5292c5f5834acdbb62d0a4 xosd-2.2.10.ebuild 1038
 MD5 1132764268b2645df6a9a3ba6bf06e4d files/bmp-dlg_config.patch 403
-MD5 7012b7e17c6cf060995e65335222ea2b files/2.2.5-xmms-trackpos.patch 4001
-MD5 47b823d1241bc14385f5e911dcbf545e files/digest-xosd-2.2.5-r1 62
 MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8-r1 63
 MD5 c06ab555d3db962ce6e7d8bfe88940b9 files/digest-xosd-2.2.10 64
-MD5 83fccda3ae130b4fa467759640ca4efe files/digest-xosd-2.2.12 64
+MD5 dc6cccd80375fbcc480c1dbfdc651681 files/digest-xosd-2.2.14 132
 MD5 5b6bffe8689739aff9d0eb219cc443d8 files/2.2.8-xmms-trackpos.patch 5167
diff --git a/x11-libs/xosd/files/2.2.5-xmms-trackpos.patch b/x11-libs/xosd/files/2.2.5-xmms-trackpos.patch
deleted file mode 100644
index be0435972644..000000000000
--- a/x11-libs/xosd/files/2.2.5-xmms-trackpos.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -ur xosd-2.2.5.orig/src/xmms_plugin/dlg_config.c xosd-2.2.5/src/xmms_plugin/dlg_config.c
---- xosd-2.2.5.orig/src/xmms_plugin/dlg_config.c	2003-09-29 22:48:34.875787152 -0400
-+++ xosd-2.2.5/src/xmms_plugin/dlg_config.c	2003-09-29 22:49:59.710890256 -0400
-@@ -26,7 +26,7 @@
- 
- static GtkToggleButton
-   * vol_on, *bal_on,
--  *pause_on, *trackname_on, *stop_on, *repeat_on, *shuffle_on;
-+  *pause_on, *trackname_on, *stop_on, *repeat_on, *shuffle_on, *listpos_on;
- static GtkWidget *configure_win;
- static GtkObject *timeout_obj, *offset_obj, *h_offset_obj, *shadow_obj,
-   *outline_obj;
-@@ -58,7 +58,7 @@
-   show.stop = isactive (stop_on);
-   show.repeat = isactive (repeat_on);
-   show.shuffle = isactive (shuffle_on);
--
-+  show.listpos = isactive (listpos_on);
- 
-   if (colour)
-     g_free (colour);
-@@ -564,11 +564,12 @@
-   show_item (vbox2, "Balance", show.balance, &bal_on);
-   show_item (vbox2, "Pause", show.pause, &pause_on);
-   show_item (vbox2, "Track Name", show.trackname, &trackname_on);
--  vbox2 = gtk_vbox_new (FALSE, 5);
-+  vbox2 = gtk_vbox_new (FALSE, 4);
-   gtk_box_pack_start (GTK_BOX (hbox2), vbox2, FALSE, FALSE, 0);
-   show_item (vbox2, "Stop", show.stop, &stop_on);
-   show_item (vbox2, "Repeat", show.repeat, &repeat_on);
-   show_item (vbox2, "Shuffle", show.shuffle, &shuffle_on);
-+  show_item (vbox2, "Playlist Position", show.listpos, &listpos_on);
- 
-   sep = gtk_hseparator_new ();
-   gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, FALSE, 0);
-diff -ur xosd-2.2.5.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.5/src/xmms_plugin/xmms_osd.c
---- xosd-2.2.5.orig/src/xmms_plugin/xmms_osd.c	2003-09-29 22:48:34.874787304 -0400
-+++ xosd-2.2.5/src/xmms_plugin/xmms_osd.c	2003-09-29 22:54:27.111239224 -0400
-@@ -175,6 +175,7 @@
-   show.stop = 1;
-   show.repeat = 1;
-   show.shuffle = 1;
-+  show.listpos = 1;
- 
-   g_free (colour);
-   g_free (font);
-@@ -207,6 +208,7 @@
-       xmms_cfg_read_int (cfgfile, "osd", "show_stop", &show.stop);
-       xmms_cfg_read_int (cfgfile, "osd", "show_repeat", &show.repeat);
-       xmms_cfg_read_int (cfgfile, "osd", "show_shuffle", &show.shuffle);
-+      xmms_cfg_read_int (cfgfile, "osd", "show_listpos", &show.listpos);
-       xmms_cfg_free (cfgfile);
-     }
- 
-@@ -249,6 +251,7 @@
-       xmms_cfg_write_int (cfgfile, "osd", "show_stop", show.stop);
-       xmms_cfg_write_int (cfgfile, "osd", "show_repeat", show.repeat);
-       xmms_cfg_write_int (cfgfile, "osd", "show_shuffle", show.shuffle);
-+      xmms_cfg_write_int (cfgfile, "osd", "show_listpos", show.listpos);
- 
-       xmms_cfg_write_default_file (cfgfile);
-       xmms_cfg_free (cfgfile);
-@@ -376,10 +379,13 @@
- 	  if (title != NULL)
- 	    {
- 	      title2 = malloc (strlen (current.title) + 26);
-+	      if (show.listpos)
- 	      sprintf (title2, "%i/%i: %s",
- 		       xmms_remote_get_playlist_pos (gp.xmms_session) + 1,
- 		       xmms_remote_get_playlist_length (gp.xmms_session),
- 		       current.title);
-+	      else
-+	      sprintf (title2,"%s",current.title);
- 	    }
- 	}
-     }
-@@ -400,6 +406,7 @@
- 	      if (current.title != NULL)
- 		{
- 		  title2 = malloc (strlen (current.title) + 52);
-+		if (show.listpos)
- 		  sprintf (title2, "%i/%i: %s (%.2i:%.2i)",
- 			   xmms_remote_get_playlist_pos (gp.xmms_session) + 1,
- 			   xmms_remote_get_playlist_length (gp.xmms_session),
-@@ -408,6 +415,11 @@
- 			   1000 / 60,
- 			   xmms_remote_get_output_time (gp.xmms_session) /
- 			   1000 % 60);
-+		else
-+		  sprintf (title2,"%s (%.2i:%.2i)",
-+			   current.title,
-+			   xmms_remote_get_output_time(gp.xmms_session)/1000/60,
-+			   xmms_remote_get_output_time(gp.xmms_session)/1000%60);
- 		}
- 	    }
- 	}
-diff -ur xosd-2.2.5.orig/src/xmms_plugin/xmms_osd.h xosd-2.2.5/src/xmms_plugin/xmms_osd.h
---- xosd-2.2.5.orig/src/xmms_plugin/xmms_osd.h	2003-09-29 22:48:34.874787304 -0400
-+++ xosd-2.2.5/src/xmms_plugin/xmms_osd.h	2003-09-29 22:54:45.944376152 -0400
-@@ -21,6 +21,7 @@
-   gboolean stop;
-   gboolean repeat;
-   gboolean shuffle;
-+  gboolean listpos;
- };
- extern struct show show;
- 
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.12 b/x11-libs/xosd/files/digest-xosd-2.2.12
deleted file mode 100644
index e1f48aea48cf..000000000000
--- a/x11-libs/xosd/files/digest-xosd-2.2.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 756d714cec908e4d4c956ff0e7dcd4c4 xosd-2.2.12.tar.bz2 287514
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.14 b/x11-libs/xosd/files/digest-xosd-2.2.14
new file mode 100644
index 000000000000..a9202822f5ea
--- /dev/null
+++ b/x11-libs/xosd/files/digest-xosd-2.2.14
@@ -0,0 +1,2 @@
+MD5 4b349fe930e4eee2f504d6c02673e24d xosd_2.2.14.orig.tar.gz 418331
+MD5 6b29383308eba681b842d3419d72b220 xosd_2.2.14-1.diff.gz 8616
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.5-r1 b/x11-libs/xosd/files/digest-xosd-2.2.5-r1
deleted file mode 100644
index 60827abb3603..000000000000
--- a/x11-libs/xosd/files/digest-xosd-2.2.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 96bae6f0800c1710d7d4edb3b37b01e5 xosd-2.2.5.tar.gz 388861
diff --git a/x11-libs/xosd/xosd-2.2.12.ebuild b/x11-libs/xosd/xosd-2.2.12.ebuild
deleted file mode 100644
index 66d2180f21bf..000000000000
--- a/x11-libs/xosd/xosd-2.2.12.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.12.ebuild,v 1.3 2005/02/25 16:56:46 agriffis Exp $
-
-inherit eutils
-
-IUSE="xinerama xmms bmp"
-
-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="~x86 ~sparc ~ppc ~alpha ~hppa ~ia64 ~amd64 ~ppc64"
-
-DEPEND="virtual/x11
-	bmp? (media-sound/beep-media-player >=media-libs/gdk-pixbuf-0.22.0 )
-	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 || use bmp || myconf="${myconf} --disable-new-plugin"
-
-	if use bmp ; then
-		# The files from xmms_plugin need to be copied over and patched with sed and epatch
-		mkdir ${S}/src/bmp_plugin
-		cp ${S}/src/xmms_plugin/* ${S}/src/bmp_plugin/
-
-		# Add the bmp_plugin directory to the configure script
-		sed -i -e 's: src/xmms_plugin/Makefile : src/xmms_plugin/Makefile src/bmp_plugin/Makefile :g' configure
-
-		# Add the directory to the Makefile.* files in the src/ directory so that the Makefile
-		# will be generated properly
-		cd ${S}/src
-		echo	"Makefile.in
-			Makefile.am" | xargs sed -i -e 's:xmms_plugin:xmms_plugin bmp_plugin:g'
-
-		# Convert the right "xmms"es to "bmp"s
-		cd ${S}/src/bmp_plugin
-		echo    "Makefile
-			Makefile.in" | xargs sed -i -e 's:libxmms_osd:libbmp_osd:g' -e 's:/xmms/:/bmp/:g'
-
-		# Finally, apply a trivial patch
-		epatch ${FILESDIR}/bmp-dlg_config.patch
-
-		cd ${S}
-	fi
-
-	econf ${myconf} || die
-
-	# Since the "--disable-new-plugin" flag was enabled if the 'bmp' or 'xmms' USE flag was specified,
-	# the src/xmms_plugin directory has to be manually removed from the Makefile in the src/ directory
-	# if the user didn't want the xmms plugin to be compiled
-	use xmms || (cd ${S}/src && sed -i -e 's:xmms_plugin::g' Makefile)
-	# Fix some things not done right by econf in the src/bmp_plugin directory
-	use bmp && (cd ${S}/src/bmp_plugin && sed -i -e 's:xmms-config:beep-config:g' -e 's:libdir)/xmms:libdir)/bmp:g' -e 's:-lxmms:-lbeep:g' -e 's:xmms/:bmp/:g' Makefile)
-
-	cd ${S}
-
-	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.5-r1.ebuild b/x11-libs/xosd/xosd-2.2.14.ebuild
index fdc72bf3ed2b..c63895217141 100644
--- a/x11-libs/xosd/xosd-2.2.5-r1.ebuild
+++ b/x11-libs/xosd/xosd-2.2.14.ebuild
@@ -1,26 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.5-r1.ebuild,v 1.9 2005/02/25 16:56:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.14.ebuild,v 1.1 2005/03/25 11:46:20 lanius Exp $
 
 inherit eutils
 
-IUSE="xinerama xmms"
+IUSE="xinerama xmms bmp"
 
 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="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/x/xosd/${PN}_${PV}-1.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ppc alpha hppa ia64 amd64"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~ia64 ~amd64 ~ppc64"
 
 DEPEND="virtual/x11
+	bmp? (media-sound/beep-media-player >=media-libs/gdk-pixbuf-0.22.0 )
 	xmms? ( media-sound/xmms >=media-libs/gdk-pixbuf-0.22.0 )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-xmms-trackpos.patch
+	epatch ${FILESDIR}/2.2.8-xmms-trackpos.patch
+	epatch ${DISTDIR}/${PN}_${PV}-1.diff.gz
 }
 
 src_compile() {
@@ -29,17 +32,14 @@ src_compile() {
 	use xinerama || myconf="${myconf} --disable-xinerama"
 
 	use xmms || myconf="${myconf} --disable-new-plugin"
+	use bmp || myconf="${myconf} --disable-beep_media_player"
 
-	econf ${myconf} || die
 
+	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
+	dodoc AUTHORS ChangeLog NEWS COPYING README TODO
 }