Remove xmms useflag, always disable, and remove the trackpos patch.

(Portage version: 2.1.2_rc1-r6)
 (Signed Manifest commit)

2 files changed, 26 insertions, 159 deletions

diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index 3e1047f5b1f4..2a7a7d42cc36 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,7 +1,6 @@
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bmp-dlg_config.patch 403 RMD160 40ec201fe3edf3155c4c9d3dfdc8d30323287446 SHA1 ed5138fa6a43267de7cbc49162a1b053691c3cd0 SHA256 b40712da31de131709f66f85e7032031eebcf20f006f9c6d8c6248b76f53a784
 MD5 1132764268b2645df6a9a3ba6bf06e4d files/bmp-dlg_config.patch 403
 RMD160 40ec201fe3edf3155c4c9d3dfdc8d30323287446 files/bmp-dlg_config.patch 403
@@ -19,22 +18,22 @@ DIST xosd-2.2.8.tar.bz2 281156 RMD160 a5ec252699c03b324857ae7d1e32c6c34fe3fc6a S
 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 1616 RMD160 78be507971afb0cb23faec7db0eaeb3bc33f369c SHA1 32593730abb59a99f8c7a43890ea30f4b8344c68 SHA256 e55c2d97fcfaba544e479b10ac616d60415c0a5d925bb9a0c9292abbec3ea942
-MD5 333b6d897ff18a6c15aff773c2d2521a xosd-2.2.14-r1.ebuild 1616
-RMD160 78be507971afb0cb23faec7db0eaeb3bc33f369c xosd-2.2.14-r1.ebuild 1616
-SHA256 e55c2d97fcfaba544e479b10ac616d60415c0a5d925bb9a0c9292abbec3ea942 xosd-2.2.14-r1.ebuild 1616
-EBUILD xosd-2.2.8-r1.ebuild 1190 RMD160 36517905170bb7ded2bd28ffec36528d384fed10 SHA1 32a4166d9e5b8b815ce2855d630219552bd6062c SHA256 03f085b3d33594dfdd6fa6da8e57b8ca0e5f450d3ac9a75ea4552a4af3ec7252
-MD5 e9d469a806759c2ab87bbea576049ab5 xosd-2.2.8-r1.ebuild 1190
-RMD160 36517905170bb7ded2bd28ffec36528d384fed10 xosd-2.2.8-r1.ebuild 1190
-SHA256 03f085b3d33594dfdd6fa6da8e57b8ca0e5f450d3ac9a75ea4552a4af3ec7252 xosd-2.2.8-r1.ebuild 1190
-MISC ChangeLog 7641 RMD160 e6411120502f5eb394c3b91a89d18c7203c5ce90 SHA1 1a3f1b7e4006c9f6ca8c414e922b858ccc09d8d8 SHA256 91ac4da67a7c102f0e8642ce08d944deb9111ae535ac1e641eae1bb14ca6c254
-MD5 1b7910e5a8b321943e701fef413a7a0a ChangeLog 7641
-RMD160 e6411120502f5eb394c3b91a89d18c7203c5ce90 ChangeLog 7641
-SHA256 91ac4da67a7c102f0e8642ce08d944deb9111ae535ac1e641eae1bb14ca6c254 ChangeLog 7641
+EBUILD xosd-2.2.10-r1.ebuild 988 RMD160 5b512286b84fe98a569776c363e94d4f02e1803e SHA1 6e18409dc8e5e923c91f3436f2a124b1a0537787 SHA256 4e6a1fd6295a881d648f94d8a0ef6fef0a0250cdbcdf27222e59a550daeafe62
+MD5 3174fea601630a2275ab24ccba85fefd xosd-2.2.10-r1.ebuild 988
+RMD160 5b512286b84fe98a569776c363e94d4f02e1803e xosd-2.2.10-r1.ebuild 988
+SHA256 4e6a1fd6295a881d648f94d8a0ef6fef0a0250cdbcdf27222e59a550daeafe62 xosd-2.2.10-r1.ebuild 988
+EBUILD xosd-2.2.14-r1.ebuild 1491 RMD160 c97ce2b5749eef00c48ca519cc99dfcd0cd8f15a SHA1 bbea1f39a381db75b1da155b136a8156d99b387e SHA256 63d07a4a487cffe2c1edc3c8da0c1e4580269bffb1d428642cba98d70340b24f
+MD5 785dea5ec88333fc79c4f5f3c67ee227 xosd-2.2.14-r1.ebuild 1491
+RMD160 c97ce2b5749eef00c48ca519cc99dfcd0cd8f15a xosd-2.2.14-r1.ebuild 1491
+SHA256 63d07a4a487cffe2c1edc3c8da0c1e4580269bffb1d428642cba98d70340b24f xosd-2.2.14-r1.ebuild 1491
+EBUILD xosd-2.2.8-r1.ebuild 1066 RMD160 758988fca7731e408445f141a79a823a07f3098c SHA1 7fdb11800686f9d73585c9a1a63ca55333006f7d SHA256 60de059733576fa09551fd1fe3775657fd522f1ecd7f2d9bb7fe677011b76c9e
+MD5 9ad823c7480aa18626261fe72dca1e32 xosd-2.2.8-r1.ebuild 1066
+RMD160 758988fca7731e408445f141a79a823a07f3098c xosd-2.2.8-r1.ebuild 1066
+SHA256 60de059733576fa09551fd1fe3775657fd522f1ecd7f2d9bb7fe677011b76c9e xosd-2.2.8-r1.ebuild 1066
+MISC ChangeLog 7874 RMD160 1d94d336769c6cab90088745998dffdd171a4d19 SHA1 af6f528868c1bbd21ea6714d1b5d87b82d62aefb SHA256 ad3eb876e161d2049a2fec4c748c9f97bec6d290a6db3bb38846c2528af757c4
+MD5 f7848b2b54cc59ff0da1459b6cbcb090 ChangeLog 7874
+RMD160 1d94d336769c6cab90088745998dffdd171a4d19 ChangeLog 7874
+SHA256 ad3eb876e161d2049a2fec4c748c9f97bec6d290a6db3bb38846c2528af757c4 ChangeLog 7874
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -48,3 +47,10 @@ SHA256 fc3379b0260e5442b662c7dc62da55479b06ddf09b1377fa93b613129fad013f files/di
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFWILbAiZjviIA2XgRAsoXAKCB9CLL85hRevaRZMhSHAuFAJs3jACgglc5
+zFYcW/kTo6H6/tT0Bd5fbX0=
+=qokL
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/xosd/files/2.2.8-xmms-trackpos.patch b/x11-libs/xosd/files/2.2.8-xmms-trackpos.patch
deleted file mode 100644
index 06d3e7cb7bc6..000000000000
--- a/x11-libs/xosd/files/2.2.8-xmms-trackpos.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -rc xosd-2.2.8/src/xmms_plugin/dlg_config.c xosd-2.2.8.patch/src/xmms_plugin/dlg_config.c
-*** xosd-2.2.8/src/xmms_plugin/dlg_config.c	Fri Oct  3 02:09:32 2003
---- xosd-2.2.8.patch/src/xmms_plugin/dlg_config.c	Thu Jul 22 19:53:58 2004
-***************
-*** 26,32 ****
-  
-  static GtkToggleButton
-    * vol_on, *bal_on,
-!   *pause_on, *trackname_on, *stop_on, *repeat_on, *shuffle_on;
-  static GtkWidget *configure_win;
-  static GtkObject *timeout_obj, *offset_obj, *h_offset_obj, *shadow_obj,
-    *outline_obj;
---- 26,32 ----
-  
-  static GtkToggleButton
-    * vol_on, *bal_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,64 ****
-    show.stop = isactive(stop_on);
-    show.repeat = isactive(repeat_on);
-    show.shuffle = isactive(shuffle_on);
-! 
-  
-    if (colour)
-      g_free(colour);
---- 58,64 ----
-    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);
-***************
-*** 532,542 ****
-    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);
-    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);
-  
-    sep = gtk_hseparator_new();
-    gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
---- 532,543 ----
-    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, 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 -rc xosd-2.2.8/src/xmms_plugin/xmms_osd.c xosd-2.2.8.patch/src/xmms_plugin/xmms_osd.c
-*** xosd-2.2.8/src/xmms_plugin/xmms_osd.c	Fri Oct  3 02:09:31 2003
---- xosd-2.2.8.patch/src/xmms_plugin/xmms_osd.c	Thu Jul 22 23:15:50 2004
-***************
-*** 170,175 ****
---- 170,176 ----
-    show.stop = 1;
-    show.repeat = 1;
-    show.shuffle = 1;
-+   show.listpos = 1;
-  
-    g_free(colour);
-    g_free(font);
-***************
-*** 201,206 ****
---- 202,208 ----
-      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);
-    }
-  
-***************
-*** 242,247 ****
---- 244,250 ----
-      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);
-***************
-*** 386,395 ****
-        title = malloc(len);
-        playlist_time =
-          withtime ? xmms_remote_get_output_time(gp.xmms_session) : 0;
-!       snprintf(title, len,
-                 withtime ? "%i/%i: %s (%i:%02i)" : "%i/%i: %s",
-                 current.pos + 1, playlist_length, current.title,
-                 playlist_time / 1000 / 60, playlist_time / 1000 % 60);
-        replace_hexcodes(title);
-        xosd_display(osd, 1, XOSD_string, title);
-        free(title);
---- 389,405 ----
-        title = malloc(len);
-        playlist_time =
-          withtime ? xmms_remote_get_output_time(gp.xmms_session) : 0;
-!       if (show.listpos)
-!         snprintf(title, len,
-                 withtime ? "%i/%i: %s (%i:%02i)" : "%i/%i: %s",
-                 current.pos + 1, playlist_length, current.title,
-                 playlist_time / 1000 / 60, playlist_time / 1000 % 60);
-+       else
-+         snprintf(title, len,
-+                withtime ? "%s (%i:%02i)" : "%s",
-+                current.title,
-+                playlist_time / 1000 / 60, playlist_time / 1000 % 60);
-+ 
-        replace_hexcodes(title);
-        xosd_display(osd, 1, XOSD_string, title);
-        free(title);
-diff -rc xosd-2.2.8/src/xmms_plugin/xmms_osd.h xosd-2.2.8.patch/src/xmms_plugin/xmms_osd.h
-*** xosd-2.2.8/src/xmms_plugin/xmms_osd.h	Fri Oct  3 02:09:31 2003
---- xosd-2.2.8.patch/src/xmms_plugin/xmms_osd.h	Thu Jul 22 20:02:01 2004
-***************
-*** 21,26 ****
---- 21,27 ----
-    gboolean stop;
-    gboolean repeat;
-    gboolean shuffle;
-+   gboolean listpos;
-  };
-  extern struct show show;
-