gentoo resync : 25.03.2018

3 files changed, 0 insertions, 148 deletions

diff --git a/app-text/xfbib/Manifest b/app-text/xfbib/Manifest
index e439829cc5d1..9bafc32ea749 100644
--- a/app-text/xfbib/Manifest
+++ b/app-text/xfbib/Manifest
@@ -1,6 +1,4 @@
-AUX xfbib-0.0.2-libxfce4ui.patch 2662 BLAKE2B 261e9de735f6872ad30675af2073a6535776847a110ad9d752e71d030820bb2181a893be674b10c585634f62d81c304afb2b52d6bd97b3ab62f240548c7e69ec SHA512 0fadc92daf23de69e8074870933a98c60dfd91d1d505299fbcd0c774a01cce4c81b00b0c08c37f8609a85897cf9b4d3ace5b08c5694ea246baa46bfc70394d2b
 AUX xfbib-0.0.2-validate.patch 349 BLAKE2B 282c326fe8f80039a10930777a063bd556447617c74dcd7ccee8ab0572169521029246e4ac2728b8188c19dff41d5c4df0027d338f454fdf0f66f625f819d1de SHA512 fffd683dc018889793dc9371c756ec89c89d7de0a1c863aba9bac3fad8660baf16688b02831f83c07642de401c134ed86b62e34c95018c8836c714ad2fe89035
 DIST xfbib-0.0.2.tar.bz2 340703 BLAKE2B 4f15fb39fc55e06b5cde8961db27661f3f2f2e954e52e809105fb7f3326f54c63e63acb6fa21585da8a5aa340eafd4bc33df73822fe9f6ac7a04e67d95db6e0a SHA512 7f6f812bfdb6b95574f66b63e51fb1a70ce20fd795b6070b055cdc8e753656a266237be92a7e60865d9f1e5fa750be0af3404ecf219a8a5d89dde505c759aebc
-EBUILD xfbib-0.0.2-r1.ebuild 926 BLAKE2B 2f972986b3b315c28ef6eefa1a40137525501dd0b7c5c112378b3ff0ef6d9c8a291a2d1897aebb794473fb444ac18e2315ae6c5e32c6cd519c9952be323d4f2c SHA512 b41007e3fe8929163c416b1ef13ecfb90dbecd270005f47d7a756861a9ad23a82686ff94a665390f6bd061f3b80fdbafbe43b494413e025f7889245fd8673fee
 EBUILD xfbib-0.0.2-r2.ebuild 859 BLAKE2B ac797067144696fbb734d69018fdd6aafbe93c108ab7c084a4bc72166d154e2ca0ee5ba2681e4ef348ba6a179b21ba06d9ca1f4499a76004d70fbb9df14b3cfa SHA512 117d12c679e6fa9e6b1f9c730deafdcbf81d210e2d82f104f116f141016527239b7b387d45b0bcb66742a4f63a2adf916fb497e3f7a26e8226a9961813010f66
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch b/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch
deleted file mode 100644
index 0759dbf4e61d..000000000000
--- a/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-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/xfbib-0.0.2-r1.ebuild b/app-text/xfbib/xfbib-0.0.2-r1.ebuild
deleted file mode 100644
index 2447fd8df262..000000000000
--- a/app-text/xfbib/xfbib-0.0.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="a lightweight BibTeX editor"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfbib"
-SRC_URI="https://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
-}