Port from libxfcegui4 to libxfce4ui. Validate xfbib.desktop using desktop-file-utils.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

5 files changed, 185 insertions, 5 deletions

diff --git a/app-text/xfbib/ChangeLog b/app-text/xfbib/ChangeLog
index 4e155b3f989b..78bfe54285b6 100644
--- a/app-text/xfbib/ChangeLog
+++ b/app-text/xfbib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/xfbib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xfbib/ChangeLog,v 1.4 2012/11/15 19:45:56 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xfbib/ChangeLog,v 1.5 2012/11/30 23:43:45 ssuominen Exp $
+
+*xfbib-0.0.2-r1 (30 Nov 2012)
+
+  30 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> +xfbib-0.0.2-r1.ebuild,
+  +files/xfbib-0.0.2-libxfce4ui.patch, +files/xfbib-0.0.2-validate.patch:
+  Port from libxfcegui4 to libxfce4ui. Validate xfbib.desktop using
+  desktop-file-utils.
 
   16 Nov 2012; Andreas Schuerch <nativemad@gentoo.org> xfbib-0.0.2.ebuild:
   x86 stable, see bug 429484
diff --git a/app-text/xfbib/Manifest b/app-text/xfbib/Manifest
index 794b48028f1f..a1f10172bb4a 100644
--- a/app-text/xfbib/Manifest
+++ b/app-text/xfbib/Manifest
@@ -1,14 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xfbib-0.0.2-libxfce4ui.patch 2662 SHA256 a1ff8e69c2882eaeb2331ed963233c9b310069abbb33958926f1d7e8964649c7 SHA512 0fadc92daf23de69e8074870933a98c60dfd91d1d505299fbcd0c774a01cce4c81b00b0c08c37f8609a85897cf9b4d3ace5b08c5694ea246baa46bfc70394d2b WHIRLPOOL d614f341a8ce988e4d7110c612f3ce8e1a5e8b592fdc92c20efe662580a3adff8d4bc4eae76dcdb62e90572559ea5a2773d3cbd056f637cdb6f6e06d836ef073
+AUX xfbib-0.0.2-validate.patch 349 SHA256 9c0b19a0149dc18fc82c5166c9a14ab20131124526965b575c11782f04622e11 SHA512 fffd683dc018889793dc9371c756ec89c89d7de0a1c863aba9bac3fad8660baf16688b02831f83c07642de401c134ed86b62e34c95018c8836c714ad2fe89035 WHIRLPOOL 5a19e9e2e009ef2725376c30908af7e8c44dfb7a5baba75c9d5d63b8e7bc92b58988a4c7947fadc590dfe7aac8d61e603499b5e3177b5877f1aa67abccff465f
 DIST xfbib-0.0.2.tar.bz2 340703 SHA256 eeb668b5cedbc9a9b4d8e54767fb7262f173dd9e440031b94580ca108b95f920 SHA512 7f6f812bfdb6b95574f66b63e51fb1a70ce20fd795b6070b055cdc8e753656a266237be92a7e60865d9f1e5fa750be0af3404ecf219a8a5d89dde505c759aebc WHIRLPOOL b45d18574479c42b3fe473d38b217fa603ff0d69a8f678ea328e7af72d8bb92121dfc450e33f46b747e3a8c25e02aa689d16ba61c988bdb28815ffac52bc0807
+EBUILD xfbib-0.0.2-r1.ebuild 1040 SHA256 8fa78128754b56ca50b32a4d4f319f78f8493efb88a459a1032b3a2336f71712 SHA512 6417d52cda7c53c35cc138e6030f6242916ba17e98037b466b15d4294b3ee624c5a9388bbe503e8e90ba338ad4c6cc632e91458e0de7268499634a2986e18b24 WHIRLPOOL 8b6a71a2fcbcbdbc9e8056d67509edcc37c988bb5c30a8eee2d5dc99bcb4a8c80195f26e0db93e58cd9ffc1b07e3a46bfce890667d3716bcdf98c02976e00e07
 EBUILD xfbib-0.0.2.ebuild 923 SHA256 cf26cce7ce2b73269978a1aa452ea27edaa4307620d2afa206b5f84628c43e8a SHA512 2592443a1149f3c374a186aa6260854be2ab4611ee3a3f60352bde19e38e22a90ad643d1e5e8ab5eb487dff0c800ee0bdce8e9e9c2290dbc04ad3ee393cc025f WHIRLPOOL 19d9159bd212d292f7a3001c6bd41c670fceae0bd00836ecaaae0d6c28fe731ee7fae672d6db22f25d022f1f2126ffa83033eaa2400b332cb3b1c2455a45b6d3
-MISC ChangeLog 641 SHA256 0eb9ba2473f7fd6bf3f8874a86df786b4ce69a7e6f81236d516c18394f787d4b SHA512 14a5f9b2587f7f2df1d8f114edcf551b367c6d96563acc1934093fdf1211895da45dcc3ea2c716af5af236185ff8eb451b1b819ff5b29903c979534e7e8ef41c WHIRLPOOL 7f3249e1294ba68257e00fb6e44d98580b852629d239c8950ce0e7c04b00c3a1a36ba1c9148c4d22fa7dc52e3b85c04c61c1b163c1ac83c81a21a69e48de670e
+MISC ChangeLog 915 SHA256 86c204b7248e45d6028940747e6cc4a894b841534abd42875ae2e8805e1f9cc3 SHA512 06f258fa4f240fb35b6c4f4d7cd8e619f5bed06245644e56053e8fa1668e1c514e77ee9ca22ea57bd0e09b8d5267c2e5b439fef6a51f469056b9900ec41d3023 WHIRLPOOL 1a3b714ce6ddbd783c97846c998ad2bba7db07176a59b6e85ab67eb4d4f494eb4bef61861e6793b410492dd97ce95f8052a9c9b4cd9fd9d398596b17a7943674
 MISC metadata.xml 157 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 SHA512 54ff64307677bfe1e9b62d427e8aef8aaf32b86216858541398b5f21974247418eba7612f801ff2c333fe9a059d60e1f568046a3ac88e0ee2d59beb3a3a77148 WHIRLPOOL a42edf92b91b9922e7af397d6cbad72ba7e2ab7e5aaa4504cdd8bebdc1d87e9523e76c016eab474f4b65581a9cd58a3be13d8f52bf5ae7dc6afe96d428433a5e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCltWQACgkQakKUmsHeVLK7GwCfUcCVoIGp81L4WgTHqpTj14/M
-X6AAn37M7U23ZWjK12KOLPI26COC2ZGf
-=yGfr
+iQEcBAEBCAAGBQJQuURwAAoJEEdUh39IaPFN+oEH/REMGqE9f6c1sPNbRq5KEiSX
+yoJoVOkuzI9721s4ZLNNMNGddgNyguWkB12r7CTvz08vN0a5Ib0IaFP6eDNsR6gg
+vRTV1snYEMUIkNeIR6/dJdSOtnSxuDjSqODPY8ZCiYv2CXukscieK9wuk5I2IQZJ
+9/xk2NqYof5jwy1e9Fcgt3Jgz8OHrmUpbO/hQnupB4PR5e0hJgdA2gQsJqRVNItJ
+Zz/8SmdIJUTIz/Ma53fFL8FL5r/1PiwyWu1if0/tZhdrDzufeuzQp2nLqf0YxPoS
+yxqNO/X36PAnAoPNEkFfXi6WsqQdaQY31+HSq7DIP5amntOCjNZipJ4v3andEPs=
+=MpLe
 -----END PGP SIGNATURE-----
diff --git a/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch b/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch
new file mode 100644
index 000000000000..0759dbf4e61d
--- /dev/null
+++ b/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch
@@ -0,0 +1,106 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=9568
+
+--- src/entry_edit_dialog.c
++++ src/entry_edit_dialog.c
+@@ -17,7 +17,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <config.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "entry_edit_dialog.h"
+ #include "entry.h"
+@@ -589,11 +589,13 @@
+ 			key = (char *) gtk_entry_get_text(GTK_ENTRY(key_entry));
+ 			if ((type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(combobox))) == NULL) {
+ 				_DEBUG(("No type selected"));
+-				xfce_warn(_("No type was selected"));
++				/* xfce_warn(_("No type was selected")); */
++				xfce_dialog_show_warning(NULL,NULL,_("No type was selected"));
+ 				continue;
+ 			} else if (strcmp(key, "") == 0) {
+ 				_DEBUG(("No key selected"));
+-				xfce_warn(_("No key was selected"));
++				/* xfce_warn(_("No key was selected")); */
++				xfce_dialog_show_warning(NULL,NULL,_("No key was selected"));
+ 				continue;
+ 			} else {
+ 				if (selected == NULL) {
+--- src/menubar.c
++++ src/menubar.c
+@@ -15,7 +15,7 @@
+  */
+ 
+ #include <gtk/gtk.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libintl.h>
+ #include <config.h>
+ 
+--- src/open.c
++++ src/open.c
+@@ -14,7 +14,7 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <config.h>
+ #include <string.h>
+ #include <stdlib.h>
+--- src/open_dialog.c
++++ src/open_dialog.c
+@@ -14,7 +14,7 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libintl.h>
+ #include <string.h>
+ #include <stdlib.h>
+--- src/save_dialog.c
++++ src/save_dialog.c
+@@ -15,7 +15,7 @@
+  */
+ 
+ #include <libintl.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <config.h>
+ 
+ #include "xfbib.h"
+--- src/string_edit_dialog.c
++++ src/string_edit_dialog.c
+@@ -15,7 +15,7 @@
+  */
+ 
+ #include <gtk/gtk.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "debug.h"
+ #include "strings.h"
+--- src/treeview.c
++++ src/treeview.c
+@@ -14,7 +14,7 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libintl.h>
+ #include <config.h>
+ #include <string.h>
+--- src/xfbib.c
++++ src/xfbib.c
+@@ -20,7 +20,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <stdlib.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libintl.h>
+ 
+ #include "window.h"
diff --git a/app-text/xfbib/files/xfbib-0.0.2-validate.patch b/app-text/xfbib/files/xfbib-0.0.2-validate.patch
new file mode 100644
index 000000000000..a072b730c3a6
--- /dev/null
+++ b/app-text/xfbib/files/xfbib-0.0.2-validate.patch
@@ -0,0 +1,19 @@
+--- xfbib.desktop
++++ xfbib.desktop
+@@ -1,13 +1,11 @@
+-
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Xfbib
+ Exec=xfbib
+ Icon=xfbib
+ Type=Application
+ Comment=A BibTeX editor for Xfce
+-Terminal=0
+-MimeType=text/x-bibtex
+-Categories=Application;Office;GTK;
++Terminal=false
++MimeType=text/x-bibtex;
++Categories=Office;GTK;
+ GenericName=
+ StartupNotify=false
diff --git a/app-text/xfbib/xfbib-0.0.2-r1.ebuild b/app-text/xfbib/xfbib-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..dde6019c8f60
--- /dev/null
+++ b/app-text/xfbib/xfbib-0.0.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xfbib/xfbib-0.0.2-r1.ebuild,v 1.1 2012/11/30 23:43:45 ssuominen Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="a lightweight BibTeX editor"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfbib"
+SRC_URI="http://goodies.xfce.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.12
+	>=x11-libs/gtk+-2.10:2
+	>=xfce-base/libxfce4ui-4.8
+	>=xfce-base/libxfce4util-4.8"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-validate.patch
+		"${FILESDIR}"/${P}-libxfce4ui.patch
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_prepare() {
+	# This is to prevent eautoreconfigure:
+	sed -i -e 's:libxfcegui4-1.0:libxfce4ui-1:' configure || die
+	sed -i -e 's:$(LIBXFCE4UTIL_CFLAGS):& $(LIBXFCEGUI4_CFLAGS):' src/Makefile.in || die
+
+	xfconf_src_prepare
+}