Fix bug 45646 by syncing up rep-gtk headers with gtk+; only applies when >=gtk+-2.4 is installed. Thanks to Olivier Bulteel for the fix. Add metadata.xml naming myself as maintainer

5 files changed, 73 insertions, 10 deletions

diff --git a/x11-libs/rep-gtk/ChangeLog b/x11-libs/rep-gtk/ChangeLog
index e1dc833d9d5c..4b75a8c36abd 100644
--- a/x11-libs/rep-gtk/ChangeLog
+++ b/x11-libs/rep-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/rep-gtk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/ChangeLog,v 1.21 2004/02/29 15:04:38 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/ChangeLog,v 1.22 2004/03/29 19:41:05 agriffis Exp $
+
+  29 Mar 2004; Aron Griffis <agriffis@gentoo.org> metadata.xml,
+  rep-gtk-0.18.ebuild, files/rep-gtk-0.18-gtk24.patch:
+  Fix bug 45646 by syncing up rep-gtk headers with gtk+; only applies when
+  >=gtk+-2.4 is installed. Thanks to Olivier Bulteel for the fix.  Add
+  metadata.xml naming myself as maintainer
 
   27 Feb 2004; Sven Blumenstein <bazik@gentoo.org> rep-gtk-0.17-r1.ebuild:
   Stable on sparc. Forgot to commit :)
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
index 001453b5a65e..c973736d082c 100644
--- a/x11-libs/rep-gtk/Manifest
+++ b/x11-libs/rep-gtk/Manifest
@@ -1,12 +1,14 @@
-MD5 28c9d2532540639900342d859e8ba04f rep-gtk-0.18.ebuild 1229
+MD5 2c9f3ab97821b1bbce83a5808477d5c8 ChangeLog 3738
 MD5 b0e214793c93ee602ea7d5d5745a0d17 rep-gtk-0.15-r3.ebuild 1118
+MD5 c2d7c722822e2de346f66940196976df rep-gtk-0.16.ebuild 1454
 MD5 3cbfbe1414af72c63aaabd7501304ef0 rep-gtk-0.17.ebuild 1200
 MD5 a21514eae2380e12e9b5cc5e235b9ad1 rep-gtk-0.17-r1.ebuild 1333
-MD5 55e39f7548faec4b4713c7c23312d239 ChangeLog 3425
-MD5 c2d7c722822e2de346f66940196976df rep-gtk-0.16.ebuild 1454
+MD5 87cb07e2d3612bc798e3722f4f882671 metadata.xml 250
+MD5 7939f2d0de9b7dfaf47c6e2dcfb4b2f6 rep-gtk-0.18.ebuild 1426
 MD5 220aadeb6d56c63c76c4a8ee31e2099f files/digest-rep-gtk-0.15-r3 64
-MD5 1ea67ff5530d10194d5eb14361003264 files/digest-rep-gtk-0.17-r1 63
 MD5 973db659f56fd74976b5195f68eb33cc files/digest-rep-gtk-0.16 129
 MD5 07badea9837cd8a9183fae4ef3dcc012 files/digest-rep-gtk-0.17 64
-MD5 a84fef69d72f4d670468dd74e8e788de files/digest-rep-gtk-0.18 64
 MD5 e46cf05f7e6b4bc7788ab928acda4d08 files/rep-gtk-0.17-64bit.patch 698
+MD5 1ea67ff5530d10194d5eb14361003264 files/digest-rep-gtk-0.17-r1 63
+MD5 a84fef69d72f4d670468dd74e8e788de files/digest-rep-gtk-0.18 64
+MD5 7e43019a0be09f8a64bbc489fa63fd6a files/rep-gtk-0.18-gtk24.patch 1580
diff --git a/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk24.patch b/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk24.patch
new file mode 100644
index 000000000000..5ae02b56ad4c
--- /dev/null
+++ b/x11-libs/rep-gtk/files/rep-gtk-0.18-gtk24.patch
@@ -0,0 +1,38 @@
+Only in rep-gtk-0.18-gtk2_patched: config.h
+diff -aur rep-gtk-0.18/gtk-compat.c rep-gtk-0.18-gtk2_patched/gtk-compat.c
+--- rep-gtk-0.18/gtk-compat.c	2002-07-12 00:19:22.000000000 -0400
++++ rep-gtk-0.18-gtk2_patched/gtk-compat.c	2004-03-27 00:59:32.109529224 -0500
+@@ -64,7 +64,7 @@
+ 
+ GtkWidget*
+ gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
+-						gchar            *label)
++						const gchar            *label)
+ {
+   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
+   return gtk_radio_menu_item_new_with_label (g, label);
+@@ -72,7 +72,7 @@
+ 
+ GtkWidget*
+ gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
+-						   gchar            *label)
++						   const gchar            *label)
+ {
+   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
+   return gtk_radio_menu_item_new_with_mnemonic (g, label);
+diff -aur rep-gtk-0.18/rep-gtk.h rep-gtk-0.18-gtk2_patched/rep-gtk.h
+--- rep-gtk-0.18/rep-gtk.h	2003-02-12 03:51:45.000000000 -0500
++++ rep-gtk-0.18-gtk2_patched/rep-gtk.h	2004-03-27 00:59:35.512011968 -0500
+@@ -291,10 +291,10 @@
+ 
+ GtkWidget*
+ gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
+-						gchar            *label);
++						const gchar      *label);
+ GtkWidget*
+ gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
+-						   gchar            *label);
++						   const gchar            *label);
+ GtkWidget* gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group);
+ GtkWidget* gtk_pixmap_new_interp (char *file, GtkWidget *intended_parent);
+ 
diff --git a/x11-libs/rep-gtk/metadata.xml b/x11-libs/rep-gtk/metadata.xml
new file mode 100644
index 000000000000..a5a4c727a5cf
--- /dev/null
+++ b/x11-libs/rep-gtk/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>gnome</herd>
+<maintainer>
+  <email>agriffis@gentoo.org</email>
+  <name>Aron Griffis</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/rep-gtk/rep-gtk-0.18.ebuild b/x11-libs/rep-gtk/rep-gtk-0.18.ebuild
index 1d45fc1454be..31c1a7c922ee 100644
--- a/x11-libs/rep-gtk/rep-gtk-0.18.ebuild
+++ b/x11-libs/rep-gtk/rep-gtk-0.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/rep-gtk-0.18.ebuild,v 1.3 2004/02/22 16:01:50 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/rep-gtk/rep-gtk-0.18.ebuild,v 1.4 2004/03/29 19:41:06 agriffis Exp $
 
 inherit eutils
 
@@ -25,8 +25,17 @@ DEPEND="virtual/glibc
 	>=sys-devel/automake-1.6.1-r5
 	>=dev-libs/librep-0.13"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die
+
+	# Fix for bug 45646 to sync up rep-gtk headers with gtk+
+	if has_version '>=x11-libs/gtk+-2.4'; then
+		epatch ${FILESDIR}/rep-gtk-0.18-gtk24.patch
+	fi
+}
 
+src_compile() {
 	./configure --host=${CHOST} \
 	    --prefix=/usr \
 	    --libexecdir=/usr/lib \
@@ -39,7 +48,6 @@ src_compile() {
 }
 
 src_install() {
-
 	make install \
 		host_type=${CHOST} \
 		installdir=${D}/usr/lib/rep/${CHOST} || die