gentoo resync : 14.07.2018

7 files changed, 184 insertions, 0 deletions

diff --git a/gnome-extra/assogiate/Manifest b/gnome-extra/assogiate/Manifest
new file mode 100644
index 000000000000..1b215d5924af
--- /dev/null
+++ b/gnome-extra/assogiate/Manifest
@@ -0,0 +1,7 @@
+AUX assogiate-0.2.1-desktop.patch 678 BLAKE2B 6aa59f1d862b829abe52f1f3681f95b2b97e66c9f481575ef5a2b6669c51a64b8c5b519bb5af284c5e65339d22a5737ad83ad6904c9d57280408f301c463bb54 SHA512 db9c31c389e6b0b8f789891bab949a3b6cb0f0d2dbb15d61e4e2d4d66506f893dc788e66e6ceb484a3c41fa2f3e82d4f30a58f052c823398bde7ca2f8b8a5968
+AUX assogiate-0.2.1-gcc-4.7.patch 729 BLAKE2B 9425f2889437ab8543ebad8b9a4da1e47760979d090ebd5d0dae2cf5386891d92e3a409f6f228e0ec002e7b108d7c7cd0b17538933b5c34105e7e9ec44ba6754 SHA512 30b6c0b4223467c5dc05e6ef9fcc111a1b2e7a6ba9d520e6d7d5cae4994dfdef0a4b4bb087e508e32593f6c8da2ff5c97a1cffd87ccc91d9c6a8f88fba936eb0
+AUX assogiate-0.2.1-glib-2.32.patch 2108 BLAKE2B 44c629864ab3c1ca6272f547ab8f1ca101bd6864aa27a7e962f05c1d3263be3df4e63fff16a44a8df796c660ed16a825ec42f786fd2a02a215db7a4ffd9daf10 SHA512 0f31eb8fabc13d898fbcf760d76de772f546a521b5a5a56d0728ced1d73d5ef98fbea96bec2075d8a392e641eee8e8729e1813f6a2caa9d2db14601de6988d47
+AUX assogiate-0.2.1-typedialog.patch 1037 BLAKE2B 310051829863b8a2c9f473244240f6471428744699438508ed7caf29c03856be46ee6d690d0d8b471f8a29961ffcadbfcc449e5a63fbabcd39b89ee2606f48f2 SHA512 d242b3933e287eb3d3e7b64ef5abe31e776307a974b9e40069ffabb19c414450cef2022ce4cc78cd28022ad8bec2c1e5e86eda50e3d94c9a23cdb352b5f6c7a1
+DIST assogiate-0.2.1.tar.bz2 369446 BLAKE2B 5b2e656eb9b1f77b73e4b736c748c45aac0be6102cc497139e8f11df38caa7874a02fd04e064e057465c2309876e9ea3a6fa5bff7164c4f3c59933f5b9b6cbb0 SHA512 d54148a13c07e6d9526c67f6522ed450e4afa86074972ae195e2fab2080a68c25f7030be21fcc8aab67aaea9b4e2f70993a402bf91e513ca93b83955b9fba8ac
+EBUILD assogiate-0.2.1-r1.ebuild 1078 BLAKE2B 15eff1369f00a24e878c4515eba0b24cd12b28f0b42f86ee04d1f3f59428e3711df8978d82fc999f2db7eed8dea72df357e574e2ceebf7f43d7e2f6e2c327d6a SHA512 2efb15d5150080f6f95c6ad72632d9b6262e11b84549a5a62f79191275a461a468c886101fa20f9e403d398f39cc970a2ce1fe13ce3a883d1e595024141b55f3
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..4737a2b52173
--- /dev/null
+++ b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils flag-o-matic gnome2
+
+DESCRIPTION="assoGiate is an editor of the file types database for GNOME"
+HOMEPAGE="http://www.kdau.com/projects/assogiate"
+SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.8:2
+	>=dev-cpp/glibmm-2.46:2
+	>=dev-cpp/gtkmm-2.24.4-r3:2.4
+	>=dev-cpp/libxmlpp-2.40:2.6
+	>=dev-cpp/gnome-vfsmm-2.26.0-r1
+"
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	# Fix desktop file
+	epatch "${FILESDIR}"/${P}-desktop.patch
+
+	# Fix compilation, bug #374911
+	epatch "${FILESDIR}"/${P}-typedialog.patch
+
+	# Fix building with glib-2.32, bug #417765
+	epatch "${FILESDIR}"/${P}-glib-2.32.patch
+
+	# Fix building with gcc-4.7
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+
+	eautoreconf
+	gnome2_src_prepare
+
+	append-cxxflags -std=c++11
+}
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
new file mode 100644
index 000000000000..3944938611de
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
@@ -0,0 +1,19 @@
+Description: Update assogiate desktop file
+Author: Vincent Legout <vincent@legout.info>
+
+Index: assogiate/data/assogiate.desktop.in
+===================================================================
+--- assogiate.orig/data/assogiate.desktop.in	2011-05-02 20:46:29.322670186 +0200
++++ assogiate/data/assogiate.desktop.in	2011-05-02 20:46:47.835433235 +0200
+@@ -1,9 +1,9 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=File Types Editor
+ _Comment=Modify the detection and display of file types
+ Exec=assogiate
+ Icon=assogiate
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;System;FileTools;
++Categories=GNOME;GTK;System;FileTools;X-GNOME-PersonalSettings;
++OnlyShowIn=GNOME;
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
new file mode 100644
index 000000000000..33d13bd067d5
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
@@ -0,0 +1,17 @@
+Description: Fix ftbfs with gcc-4.7
+Author: Vincent Legout <vlegout@debian.org>
+Last-Update: 2012-04-04
+Bug-Debian: http://bugs.debian.org/667104
+
+Index: assogiate/libassogiate/mime-package.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-package.cc	2012-03-25 10:47:26.524889975 +0200
++++ assogiate/libassogiate/mime-package.cc	2012-04-04 18:54:11.675024484 +0200
+@@ -31,6 +31,7 @@
+ #include <libxml/tree.h>
+ #include <libxml++/parsers/domparser.h>
+ #include <libgnomevfsmm/init.h>
++#include <unistd.h>
+ 
+ /******************************************************************************/
+ /* Globals                                                                    */
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
new file mode 100644
index 000000000000..0bcecc31e5ab
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
@@ -0,0 +1,57 @@
+Description: Include glib.h instead of individual headers
+Author: Vincent Legout <vlegout@debian.org>
+Bug-Debian: http://bugs.debian.org/665507
+
+Index: assogiate/libassogiate/mime-database.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-database.cc	2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/mime-database.cc	2012-03-25 10:47:00.072890551 +0200
+@@ -23,7 +23,7 @@
+ #include "private.hh"
+ #include "mime-database.hh"
+ 
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <glibmm/miscutils.h>
+ 
+ /******************************************************************************/
+Index: assogiate/libassogiate/mime-type.cc
+===================================================================
+--- assogiate.orig/libassogiate/mime-type.cc	2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/mime-type.cc	2012-03-25 10:47:00.072890551 +0200
+@@ -23,7 +23,7 @@
+ #include "private.hh"
+ #include "mime-type.hh"
+ 
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <gtkmm/icontheme.h>
+ #include <libxml++/nodes/element.h>
+ #include <libxml++/nodes/textnode.h>
+Index: assogiate/libassogiate/misc/extras.cc
+===================================================================
+--- assogiate.orig/libassogiate/misc/extras.cc	2012-03-25 10:43:34.000000000 +0200
++++ assogiate/libassogiate/misc/extras.cc	2012-03-25 10:47:00.092890549 +0200
+@@ -24,7 +24,7 @@
+ 
+ #include <algorithm>
+ #include <stdexcept>
+-#include <glib/gmem.h>
++#include <glib.h>
+ #include <glibmm/utility.h>
+ 
+ /******************************************************************************/
+Index: assogiate/src/main.cc
+===================================================================
+--- assogiate.orig/src/main.cc	2012-03-25 10:43:34.396895145 +0200
++++ assogiate/src/main.cc	2012-03-25 10:47:07.628890386 +0200
+@@ -28,8 +28,7 @@
+ #include <clocale>
+ #include <iostream>
+ #include <locale>
+-#include <glib/goption.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <glibmm/optionentry.h>
+ #include <gtk/gtkaboutdialog.h>
+ #include <gtk/gtkversion.h>
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
new file mode 100644
index 000000000000..188c69be7cad
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
@@ -0,0 +1,26 @@
+Description: Fix ftbfs
+Author: Vincent Legout <vincent@legout.info>
+Bug-Debian: http://bugs.debian.org/624924
+
+Index: assogiate/src/type-dialog.cc
+===================================================================
+--- assogiate.orig/src/type-dialog.cc	2011-05-09 16:51:09.951622099 +0200
++++ assogiate/src/type-dialog.cc	2011-05-09 16:51:53.293459257 +0200
+@@ -144,7 +144,7 @@
+ 	general_upper->pack_start(*Gtk::manage(general_info), true, true);
+ 
+ 	if (renameable) {
+-		Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector());
++		Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector(), false);
+ 		cb->signal_changed().connect
+ 			(sigc::mem_fun(*this, &TypeDialog::on_category_changed));
+ 		m_category_widget = cb;
+@@ -622,7 +622,7 @@
+ 	} else {
+ 		AddItemDialog adder(this, _("Add File Contents Rule"));
+ 
+-		Gtk::ComboBox type(MagicTypesStore::get());
++		Gtk::ComboBox type(MagicTypesStore::get(), false);
+ 		type.pack_start(MagicTypesColumns::get().name);
+ 		adder.add_item(_("_Type:"), type, true);
+ 
diff --git a/gnome-extra/assogiate/metadata.xml b/gnome-extra/assogiate/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/gnome-extra/assogiate/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>