I used to think I was indecisive, but now I'm not so sure.

dantrell · Nov 21, 2017 · 42db886 · 42db886
1 parent da05793
commit 42db886
Show file tree

Hide file tree

Showing 89 changed files with 23,081 additions and 875 deletions.
diff --git a/dev-cpp/pangomm/Manifest b/dev-cpp/pangomm/Manifest
@@ -1,4 +1,3 @@
-DIST pangomm-2.34.0.tar.xz 516028 SHA256 0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41 SHA512 d8fddf52189da99a56289e3e1aa0579da2b48a62ffd00981db9da505ebc03a734c67151d8f4f3ca85dcd47c79218cdf503f23b8e69074fe99c052596320c8309 WHIRLPOOL 6ff34e0b71134ea4e40a9d103fbac03517f56ea323969dde290d632b87dd5d26013254ac3506ffbed5ec4b1a448815f630480ce179b6c6f070a0e277b56dba0e
 DIST pangomm-2.36.0.tar.xz 773628 SHA256 a8d96952c708d7726bed260d693cece554f8f00e48b97cccfbf4f5690b6821f0 SHA512 6b565454d675f13465b129f983c6a86c86ce6c43991f8c4e2367992a3bb9b69103581966636cc18c6e55841c7a06fb19575c5e49ffd0cb2c64ae2b02487b7a7c WHIRLPOOL 96ec448598c98e6a37ae29ee3d7cb0fd92489a38f130a1f6093d2b57c734b6a518563acf7be61f2a2dfe9e66b630dbb6492ba6d03743acef0bdbc8e62462bc47
 DIST pangomm-2.38.1.tar.xz 789476 SHA256 effb18505b36d81fc32989a39ead8b7858940d0533107336a30bc3eef096bc8b SHA512 0f25df2df46f4ec4c3dc2c82f6f26bf1a21928eef3dac8ccf314294eaf0bc68d1a8a2cd8e82a0466f1130212365a852b1aabede576a2e75417bc8acdbb7bb286 WHIRLPOOL 507d6273ba64f612f2635cb6930cfadbb361cf4d411c799b343a0a9faecdd2e457970760b2ec0d8a8cb6b34e2e745a5927e6b56d77da8b415d546f20ba2c30f7
 DIST pangomm-2.40.1.tar.xz 810384 SHA256 9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af SHA512 bed19800b76e69cc51abeb5997bdc2f687f261ebcbe36aeee51f1fbf5010a46f4b9469033c34a912502001d9985135fd5c7f7574d3de8ba33cc5832520c6aa6f WHIRLPOOL 5a06f166cc537a56fbd2e7cf106da7e288299852a9af2b4b8e600d69de880e0945941c748371a57963e0502ecc993cd9b6d88655e09bb812cf2847a83dea87e8
diff --git a/dev-cpp/pangomm/pangomm-2.34.0-r2.ebuild b/dev-cpp/pangomm/pangomm-2.34.0-r2.ebuild
diff --git a/dev-cpp/pangomm/pangomm-2.36.0-r1.ebuild b/dev-cpp/pangomm/pangomm-2.36.0-r1.ebuild
@@ -1,7 +1,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI="6"
 
 inherit gnome2 multilib-minimal
 
@@ -22,7 +21,7 @@ COMMON_DEPEND="
 	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	doc? (
 		media-gfx/graphviz
 		dev-libs/libxslt

diff --git a/dev-cpp/pangomm/pangomm-2.38.1-r1.ebuild b/dev-cpp/pangomm/pangomm-2.38.1-r1.ebuild
@@ -1,9 +1,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI="6"
 
-inherit eutils gnome2 multilib-minimal
+inherit gnome2 multilib-minimal
 
 DESCRIPTION="C++ interface for pango"
 HOMEPAGE="https://www.gtkmm.org"
@@ -22,7 +21,7 @@ COMMON_DEPEND="
 	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	doc? (
 		media-gfx/graphviz
 		dev-libs/libxslt
@@ -36,8 +35,8 @@ src_prepare() {
 	# From GNOME:
 	# 	https://git.gnome.org/browse/pangomm/patch/?id=62ec4693bbf3c16eb1566b2cb499650f996f898f
 	# 	https://git.gnome.org/browse/pangomm/patch/?id=52eb5216a89a0805a46cba39450d633b2c7ca4d4
-	epatch "${FILESDIR}"/${P}-reduce-the-cairomm-dependency-back-to-1.2.2.patch
-	epatch "${FILESDIR}"/${P}-enable-warnings-fata-use-the-same-warnings-as-glibmm-and-gtkmm.patch
+	eapply "${FILESDIR}"/${P}-reduce-the-cairomm-dependency-back-to-1.2.2.patch
+	eapply "${FILESDIR}"/${P}-enable-warnings-fata-use-the-same-warnings-as-glibmm-and-gtkmm.patch
 
 	gnome2_src_prepare
 }

diff --git a/...libs/glib/files/glib-2.43.2-doc-glib-fix-all-undocumented-unused-undeclared-symbols.patch b/...libs/glib/files/glib-2.43.2-doc-glib-fix-all-undocumented-unused-undeclared-symbols.patch
@@ -0,0 +1,37 @@
+From 1a2a689deacaac32b351ae97b00d8c35a6499cf6 Mon Sep 17 00:00:00 2001
+From: Xavier Claessens <xavier.claessens@collabora.com>
+Date: Sat, 29 Nov 2014 08:39:24 -0500
+Subject: Doc: glib: Fix all undocumented/unused/undeclared symbols
+
+There is one issue left in gscanner.h due to a bug #741305 in gtk-doc.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740814
+---
+ glib/gunicode.h                        |  4 +--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glib/gunicode.h b/glib/gunicode.h
+index 7ec6862..3109233 100644
+--- a/glib/gunicode.h
++++ b/glib/gunicode.h
+@@ -259,7 +259,7 @@ typedef enum
+  *                               a value never returned from g_unichar_get_script()
+  * @G_UNICODE_SCRIPT_COMMON:     a character used by multiple different scripts
+  * @G_UNICODE_SCRIPT_INHERITED:  a mark glyph that takes its script from the
+- * i                             base glyph to which it is attached
++ *                               base glyph to which it is attached
+  * @G_UNICODE_SCRIPT_ARABIC:     Arabic
+  * @G_UNICODE_SCRIPT_ARMENIAN:   Armenian
+  * @G_UNICODE_SCRIPT_BENGALI:    Bengali
+@@ -393,7 +393,7 @@ typedef enum
+  * @G_UNICODE_SCRIPT_PSALTER_PAHLAVI:      Psalter Pahlavi. Since: 2.42
+  * @G_UNICODE_SCRIPT_SIDDHAM:              Siddham. Since: 2.42
+  * @G_UNICODE_SCRIPT_TIRHUTA:              Tirhuta. Since: 2.42
+- * @G_UNICODE_SCRIPT_WARANG_CITI           Warang Citi. Since: 2.42
++ * @G_UNICODE_SCRIPT_WARANG_CITI:          Warang Citi. Since: 2.42
+  *
+  * The #GUnicodeScript enumeration identifies different writing
+  * systems. The values correspond to the names as defined in the
+-- 
+cgit v0.12
+