Port to GTK+-2.0.

Package-Manager: portage-2.1.3_rc9

5 files changed, 269 insertions, 30 deletions

diff --git a/media-sound/aylet/ChangeLog b/media-sound/aylet/ChangeLog
index a6db45f163eb..adcc5dcec58a 100644
--- a/media-sound/aylet/ChangeLog
+++ b/media-sound/aylet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/aylet
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aylet/ChangeLog,v 1.10 2007/07/25 14:12:18 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aylet/ChangeLog,v 1.11 2007/07/25 14:27:42 drac Exp $
+
+  25 Jul 2007; Samuli Suominen <drac@gentoo.org> +files/aylet-0.5-gtk.patch,
+  -files/aylet-0.5-implicit-declaration.patch, aylet-0.5.ebuild:
+  Port to GTK+-2.0.
 
 *aylet-0.5 (25 Jul 2007)
 
diff --git a/media-sound/aylet/Manifest b/media-sound/aylet/Manifest
index 365411e9b3a6..e9d7a24c3ccf 100644
--- a/media-sound/aylet/Manifest
+++ b/media-sound/aylet/Manifest
@@ -2,24 +2,24 @@ AUX aylet-0.3-gcc41.patch 391 RMD160 733efda22c7d082f2c4374e811efa3b4644f6aa9 SH
 MD5 e6ad59f43e93d5bf3e9be4d010010ec1 files/aylet-0.3-gcc41.patch 391
 RMD160 733efda22c7d082f2c4374e811efa3b4644f6aa9 files/aylet-0.3-gcc41.patch 391
 SHA256 7a12cacaa5f40078588ca5bf9c6559f11ac51264237be025e2b8092436a97ac8 files/aylet-0.3-gcc41.patch 391
-AUX aylet-0.5-implicit-declaration.patch 289 RMD160 5c768ae6695c2712d549a474f12d4dc6f6b7472d SHA1 de1f8bc5a24578f25af45db0677c45e17fb7bb1a SHA256 a0f0d79147a624bf3b022813a91e677d5a1b482386964301d1be01f52acd99c5
-MD5 5ffad8c1c3600073504f547f47f6e834 files/aylet-0.5-implicit-declaration.patch 289
-RMD160 5c768ae6695c2712d549a474f12d4dc6f6b7472d files/aylet-0.5-implicit-declaration.patch 289
-SHA256 a0f0d79147a624bf3b022813a91e677d5a1b482386964301d1be01f52acd99c5 files/aylet-0.5-implicit-declaration.patch 289
+AUX aylet-0.5-gtk.patch 7878 RMD160 ea789227029ebe75b583305c65e44a6630f57cb9 SHA1 751b8a46d253327cfc6c9527624a0402623f69e5 SHA256 ab48184f7cb1a5afd70fbeb1a6b7f709cd21f6583f74a06aadcd305772bd0f77
+MD5 7cf2a0658ae41edb386af2b0666c13cb files/aylet-0.5-gtk.patch 7878
+RMD160 ea789227029ebe75b583305c65e44a6630f57cb9 files/aylet-0.5-gtk.patch 7878
+SHA256 ab48184f7cb1a5afd70fbeb1a6b7f709cd21f6583f74a06aadcd305772bd0f77 files/aylet-0.5-gtk.patch 7878
 DIST aylet-0.3.tar.gz 42554 RMD160 c3d6cf9c25aaa7a7426fafc5800ab636e2253526 SHA1 5fb10e905aa378b4514da930aa742f68f449d493 SHA256 536de642dddddc47c6e757433c01fc7b3354028bb953231276c3037e0fce2c00
 DIST aylet-0.5.tar.gz 43577 RMD160 99d77eb7ff438b141495e48f057a7be631632259 SHA1 5d3417d1c78207a986abd90a5a50c21f4ee3fee2 SHA256 c8c428a63abe5087b0345709a9a8034c2e6873b6071d9f7b05578aae0f3a4f72
 EBUILD aylet-0.3.ebuild 959 RMD160 2fa7d49c05d265fa16d57a5ec0efd8b7f12f73a3 SHA1 c8340b4979e102d86cc8e231c4ac65bf2d4fa025 SHA256 1366b75685c1bc57e40b162658c4900252f7d8e75e94651ec744c28b55841ab9
 MD5 5b4f291e405498beb79f88edfff9f625 aylet-0.3.ebuild 959
 RMD160 2fa7d49c05d265fa16d57a5ec0efd8b7f12f73a3 aylet-0.3.ebuild 959
 SHA256 1366b75685c1bc57e40b162658c4900252f7d8e75e94651ec744c28b55841ab9 aylet-0.3.ebuild 959
-EBUILD aylet-0.5.ebuild 826 RMD160 eaad978ab25b373dd3be5aeb4743cb845b362280 SHA1 9decf34136bb190aafa4ea38bda9fa3984af01ec SHA256 e37652d6e6f3f4dea70ff2d9ab3c6c6fc8674d540e1153157abbecae49b04ab2
-MD5 6808acc75fd94bc3862f89e1425d93e3 aylet-0.5.ebuild 826
-RMD160 eaad978ab25b373dd3be5aeb4743cb845b362280 aylet-0.5.ebuild 826
-SHA256 e37652d6e6f3f4dea70ff2d9ab3c6c6fc8674d540e1153157abbecae49b04ab2 aylet-0.5.ebuild 826
-MISC ChangeLog 1298 RMD160 81b4df775969e74ef6d204e0dc2bdb3a0a99f3e3 SHA1 4ee254c4e7f7fee6ba017248bd52728d152e763f SHA256 8d2e39cd1679e704f898ce5120a6d350c9f2152dd25271f2275a3afb21458497
-MD5 5d74f052f32ce49a4016caee7c4857f3 ChangeLog 1298
-RMD160 81b4df775969e74ef6d204e0dc2bdb3a0a99f3e3 ChangeLog 1298
-SHA256 8d2e39cd1679e704f898ce5120a6d350c9f2152dd25271f2275a3afb21458497 ChangeLog 1298
+EBUILD aylet-0.5.ebuild 1106 RMD160 f961aa8236ae5b9d36e1bca2e334ab978993f0f4 SHA1 4ac4976f77d4bf2a83cab11010c1ccc8f64d43d8 SHA256 7c4c91ab14ca6951ea1d6df9d3a017ee9de25a9ca59cb31c805ddce742a63939
+MD5 302a51dd115e6f13f0961f3b687ce1fb aylet-0.5.ebuild 1106
+RMD160 f961aa8236ae5b9d36e1bca2e334ab978993f0f4 aylet-0.5.ebuild 1106
+SHA256 7c4c91ab14ca6951ea1d6df9d3a017ee9de25a9ca59cb31c805ddce742a63939 aylet-0.5.ebuild 1106
+MISC ChangeLog 1461 RMD160 4dfa65b951addff59b96f2ae85eb1037ed1aff7f SHA1 38e8f4d207a3a76275ad19153eee38ef40d330e0 SHA256 6a0090f59014636cdcfb1fba4460d42659d6f96e15113937c18a37a6da6a3085
+MD5 7199d42fb0c175eb1b41f423cfe4a405 ChangeLog 1461
+RMD160 4dfa65b951addff59b96f2ae85eb1037ed1aff7f ChangeLog 1461
+SHA256 6a0090f59014636cdcfb1fba4460d42659d6f96e15113937c18a37a6da6a3085 ChangeLog 1461
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
diff --git a/media-sound/aylet/aylet-0.5.ebuild b/media-sound/aylet/aylet-0.5.ebuild
index 60236dbc15d1..8d28ad44f1e0 100644
--- a/media-sound/aylet/aylet-0.5.ebuild
+++ b/media-sound/aylet/aylet-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aylet/aylet-0.5.ebuild,v 1.1 2007/07/25 14:12:18 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aylet/aylet-0.5.ebuild,v 1.2 2007/07/25 14:27:42 drac Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,23 +11,31 @@ SRC_URI="http://ftp.ibiblio.org/pub/Linux/apps/sound/players/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE=""
+IUSE="gtk"
 
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
+RDEPEND="sys-libs/ncurses
+	gtk? ( >=x11-libs/gtk+-2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-implicit-declaration.patch
+	epatch "${FILESDIR}"/${P}-gtk.patch
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DDRIVER_OSS" ${PN} || die "emake failed."
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -DDRIVER_OSS" \
+		${PN} || die "emake failed."
+	use gtk && emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} -DDRIVER_OSS" gtk2 || die "emake failed."
 }
 
 src_install() {
 	dobin ${PN}
+	use gtk && dobin x${PN}
+	local mansuffix=$(ecompress --suffix)
 	doman ${PN}.1
+	use gtk && dosym aylet.1${mansuffix} /usr/share/man/man1/xaylet.1${mansuffix}
 	dodoc ChangeLog NEWS README TODO
 }
diff --git a/media-sound/aylet/files/aylet-0.5-gtk.patch b/media-sound/aylet/files/aylet-0.5-gtk.patch
new file mode 100644
index 000000000000..72972ec1b9ff
--- /dev/null
+++ b/media-sound/aylet/files/aylet-0.5-gtk.patch
@@ -0,0 +1,238 @@
+diff -ur aylet-0.5.orig/Makefile aylet-0.5/Makefile
+--- aylet-0.5.orig/Makefile	2005-12-18 05:05:08.000000000 +0200
++++ aylet-0.5/Makefile	2007-07-25 17:14:19.000000000 +0300
+@@ -39,14 +39,29 @@
+ 
+ all: aylet xaylet
+ 
++
++# GTK+1.2 stuff: "make all" or "make gtk1"
++GTKCONFIG=gtk-config
++GTKFLAGS=-UGTK2
++gtk1: all
++
++# GTK+2 stuff: "make gtk2"
++gtk2: GTKCONFIG:=pkg-config gtk+-2.0
++gtk2: GTKFLAGS:=-DGTK2 $(shell \
++			 $(GTKCONFIG) --modversion | \
++			 awk 'BEGIN { FS="." } \
++			      1 { if ($$1 > 2 || ($$1 == 2 && $$2 >= 6)) \
++				  { print "-DGTK2_6" } }')
++gtk2: all
++
+ aylet: $(OBJS)
+ 	$(CC) -o aylet $(OBJS) $(CURSES_LIB)
+ 
+ xaylet: $(XOBJS)
+-	$(CC) -o xaylet $(XOBJS) `gtk-config --libs`
++	$(CC) -o xaylet $(XOBJS) `$(GTKCONFIG) --libs`
+ 
+ uigtk.o: uigtk.c
+-	$(CC) $(CFLAGS) `gtk-config --cflags` -c uigtk.c -o uigtk.o
++	$(CC) $(CFLAGS) $(GTKFLAGS) `$(GTKCONFIG) --cflags` -c uigtk.c -o uigtk.o
+ 
+ installdirs:
+ 	/bin/sh ./mkinstalldirs $(BINDIR) $(XBINDIR) $(MANDIR)
+diff -ur aylet-0.5.orig/ui.c aylet-0.5/ui.c
+--- aylet-0.5.orig/ui.c	2003-11-27 21:42:47.000000000 +0200
++++ aylet-0.5/ui.c	2007-07-25 17:14:53.000000000 +0300
+@@ -5,7 +5,9 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <signal.h>
+ #include <curses.h>
+@@ -188,8 +190,8 @@
+   {
+   need_update=0;
+   draw_frame();
+-  draw_status(ay_filenames[ay_file],aydata.miscstr,aydata.authorstr,
+-              ay_track+1,aydata.tracks[ay_track].namestr);
++  draw_status(ay_filenames[ay_file],(char *)aydata.miscstr, (char *)aydata.authorstr,
++              ay_track+1, (char *)aydata.tracks[ay_track].namestr);
+   }
+ 
+ /* update time display */
+Only in aylet-0.5: ui.c.orig
+diff -ur aylet-0.5.orig/uigtk.c aylet-0.5/uigtk.c
+--- aylet-0.5.orig/uigtk.c	2002-09-14 18:45:45.000000000 +0300
++++ aylet-0.5/uigtk.c	2007-07-25 17:14:22.000000000 +0300
+@@ -14,11 +14,13 @@
+ #include "ui.h"
+ 
+ /* button pixmaps */
++#ifndef GTK2_6
+ #include "button1.xpm"
+ #include "button2.xpm"
+ #include "button3.xpm"
+ #include "button4.xpm"
+ #include "button5.xpm"
++#endif
+ 
+ 
+ static GtkWidget *window,*vbox,*detailstbl,*detaillabel[5];
+@@ -107,6 +109,11 @@
+ GdkBitmap *bitmap,*mask;
+ int tbl_row,width;
+ 
++#ifdef GTK2
++#define gtk_accel_group_get_default() accel
++  GtkAccelGroup *accel;
++#endif
++
+ window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_signal_connect(GTK_OBJECT(window),"destroy",
+                    GTK_SIGNAL_FUNC(cb_doquit),NULL);
+@@ -116,6 +123,11 @@
+ gtk_window_set_title(GTK_WINDOW(window),"xaylet");
+ gtk_window_set_policy(GTK_WINDOW(window),FALSE,TRUE,FALSE);	/* XXX? */
+ 
++#ifdef GTK2
++  accel = gtk_accel_group_new ();
++  gtk_window_add_accel_group (GTK_WINDOW (window), accel);
++#endif
++
+ /* main vbox */
+ vbox=gtk_vbox_new(FALSE,0);
+ gtk_container_add(GTK_CONTAINER(window),vbox);
+@@ -194,7 +206,11 @@
+ DO_TBL_RIGHT(statustbl,1, 1,2,"");
+ label_for_time=label;
+ 
++#ifdef GTK2
++  highspeed_widget = gtk_check_button_new_with_mnemonic ("_High speed");
++#else
+ highspeed_widget=gtk_check_button_new_with_label("High-speed");
++#endif
+ /* don't allow focus, looks too weird and we have shortcut */
+ GTK_WIDGET_UNSET_FLAGS(highspeed_widget,GTK_CAN_FOCUS);
+ gtk_table_attach_defaults(GTK_TABLE(statustbl),highspeed_widget, 2,4, 0,2);
+@@ -227,6 +243,21 @@
+ gtk_container_set_border_width(GTK_CONTAINER(buttontbl),5);
+ gtk_widget_show(buttontbl);
+ 
++#ifdef GTK2_6 /* >= GTK+ 2.6 */
++#define ADD_PIXMAP_TO_BUTTON(button,xpm,stock) \
++  pixmap = gtk_image_new_from_stock (GTK_STOCK_MEDIA_##stock, \
++				     GTK_ICON_SIZE_BUTTON); \
++  gtk_container_add (GTK_CONTAINER ((button)), pixmap); \
++  gtk_widget_show (pixmap)
++#else /* < GTK+ 2.6 */
++#define ADD_PIXMAP_TO_BUTTON(button,xpm,stock) \
++  bitmap=gdk_pixmap_create_from_xpm_d(window->window,&mask,	\
++                                      &(window->style->black),	\
++                                      (xpm));			\
++  pixmap=gtk_pixmap_new(bitmap,mask);				\
++  gtk_container_add(GTK_CONTAINER(button),pixmap);		\
++  gtk_widget_show(pixmap)
++#endif
+ 
+ hbox=gtk_hbox_new(TRUE,5);
+ gtk_table_attach_defaults(GTK_TABLE(buttontbl),hbox, 0,4, 0,1);
+@@ -236,16 +267,8 @@
+ /* XXX this seems to be needed here, but is it ok? */
+ gtk_widget_realize(window);
+ 
+-#define ADD_PIXMAP_TO_BUTTON(button,xpm) \
+-  bitmap=gdk_pixmap_create_from_xpm_d(window->window,&mask,	\
+-                                      &(window->style->black),	\
+-                                      (xpm));			\
+-  pixmap=gtk_pixmap_new(bitmap,mask);				\
+-  gtk_container_add(GTK_CONTAINER(button),pixmap);		\
+-  gtk_widget_show(pixmap)
+-
+ button=gtk_button_new();
+-ADD_PIXMAP_TO_BUTTON(button,button1);
++ADD_PIXMAP_TO_BUTTON(button,button1,PREVIOUS);
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_prev_track),NULL);
+@@ -256,7 +279,7 @@
+ gtk_widget_show(button);
+ 
+ button=gtk_button_new();
+-ADD_PIXMAP_TO_BUTTON(button,button2);
++ADD_PIXMAP_TO_BUTTON(button,button2,PLAY);
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_play),NULL);
+@@ -266,7 +289,7 @@
+ gtk_widget_show(button);
+ 
+ button=gtk_button_new();
+-ADD_PIXMAP_TO_BUTTON(button,button3);
++ADD_PIXMAP_TO_BUTTON(button,button3,PAUSE);
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_pause),NULL);
+@@ -276,7 +299,7 @@
+ gtk_widget_show(button);
+ 
+ button=gtk_button_new();
+-ADD_PIXMAP_TO_BUTTON(button,button4);
++ADD_PIXMAP_TO_BUTTON(button,button4,STOP);
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_stop),NULL);
+@@ -286,7 +309,7 @@
+ gtk_widget_show(button);
+ 
+ button=gtk_button_new();
+-ADD_PIXMAP_TO_BUTTON(button,button5);
++ADD_PIXMAP_TO_BUTTON(button,button5,NEXT);
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_next_track),NULL);
+@@ -295,7 +318,11 @@
+ GTK_WIDGET_UNSET_FLAGS(button,GTK_CAN_FOCUS);
+ gtk_widget_show(button);
+ 
++#ifdef GTK2
++  button = gtk_button_new_with_mnemonic ("_Restart");
++#else
+ button=gtk_button_new_with_label("Restart");
++#endif
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_restart),NULL);
+@@ -304,17 +331,24 @@
+ GTK_WIDGET_UNSET_FLAGS(button,GTK_CAN_FOCUS);
+ gtk_widget_show(button);
+ 
+-
+ /* second row, these go straight on the table */
+ /* backspace/delete/space are dealt with by keypress() */
++#ifdef GTK2
++  button = gtk_button_new_with_mnemonic ("_Previous file");
++#else
+ button=gtk_button_new_with_label("Prev File");
++#endif
+ gtk_table_attach_defaults(GTK_TABLE(buttontbl),button, 1,2, 1,2);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_prev_file),NULL);
+ GTK_WIDGET_UNSET_FLAGS(button,GTK_CAN_FOCUS);
+ gtk_widget_show(button);
+ 
++#ifdef GTK2
++  button = gtk_button_new_with_mnemonic("_Next file");
++#else
+ button=gtk_button_new_with_label("Next File");
++#endif
+ gtk_table_attach_defaults(GTK_TABLE(buttontbl),button, 2,3, 1,2);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_next_file),NULL);
+@@ -386,8 +420,8 @@
+ if(need_update)
+   {
+   need_update=0;
+-  ui_draw_status(ay_filenames[ay_file],aydata.miscstr,aydata.authorstr,
+-                 ay_track+1,aydata.tracks[ay_track].namestr);
++  ui_draw_status(ay_filenames[ay_file], (char *)aydata.miscstr, (char *)aydata.authorstr,
++                 ay_track+1, (char *)aydata.tracks[ay_track].namestr);
+   }
+ 
+ /* update time display */
diff --git a/media-sound/aylet/files/aylet-0.5-implicit-declaration.patch b/media-sound/aylet/files/aylet-0.5-implicit-declaration.patch
deleted file mode 100644
index 82e0c3be0d26..000000000000
--- a/media-sound/aylet/files/aylet-0.5-implicit-declaration.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur aylet-0.5.orig/ui.c aylet-0.5/ui.c
---- aylet-0.5.orig/ui.c	2003-11-27 21:42:47.000000000 +0200
-+++ aylet-0.5/ui.c	2007-07-25 17:03:29.000000000 +0300
-@@ -5,6 +5,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <sys/types.h>
- #include <signal.h>