From 406dd03ad06d017553c7917f4f48bfe00af588a7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 18:26:09 +0100 Subject: virtual/pkgconfig: adjust some ::redcore ebuilds to gentoo's changes --- .../linux-steam-integration-0.7.3.ebuild | 2 +- dev-libs/fribidi/Manifest | 1 - dev-libs/fribidi/files/no-config-h.diff | 211 --------------------- dev-libs/fribidi/fribidi-1.0.5-r1337.ebuild | 32 ---- x11-libs/gtk+/gtk+-2.24.32-r314.ebuild | 2 +- x11-libs/gtk+/gtk+-3.24.5-r314.ebuild | 2 +- 6 files changed, 3 insertions(+), 247 deletions(-) delete mode 100644 dev-libs/fribidi/Manifest delete mode 100644 dev-libs/fribidi/files/no-config-h.diff delete mode 100644 dev-libs/fribidi/fribidi-1.0.5-r1337.ebuild diff --git a/app-emulation/linux-steam-integration/linux-steam-integration-0.7.3.ebuild b/app-emulation/linux-steam-integration/linux-steam-integration-0.7.3.ebuild index 92912dfd..223a11e4 100644 --- a/app-emulation/linux-steam-integration/linux-steam-integration-0.7.3.ebuild +++ b/app-emulation/linux-steam-integration/linux-steam-integration-0.7.3.ebuild @@ -16,7 +16,7 @@ IUSE="" RDEPEND="app-emulation/steam" DEPEND="x11-libs/gtk+:3 - virtual/pkgconfig[${MULTILIB_USEDEP}]" + virtual/pkgconfig" PATCHES=( "${FILESDIR}"/bzip2.patch ) diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest deleted file mode 100644 index f2468fa8..00000000 --- a/dev-libs/fribidi/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2 diff --git a/dev-libs/fribidi/files/no-config-h.diff b/dev-libs/fribidi/files/no-config-h.diff deleted file mode 100644 index 394c6787..00000000 --- a/dev-libs/fribidi/files/no-config-h.diff +++ /dev/null @@ -1,211 +0,0 @@ -Description: Removed HAVE_CONFIG_H from public API -Origin: commit:b534ab2642f694c3106d5bc8d0a8beae60bf60d3 -Author: Dov Grobgeld -Date: Sat Aug 18 20:37:22 2018 +0300 - -diff --git a/bin/fribidi-benchmark.c b/bin/fribidi-benchmark.c -index e5fc9c0..07ac336 100644 ---- a/bin/fribidi-benchmark.c -+++ b/bin/fribidi-benchmark.c -@@ -33,6 +33,11 @@ - #include - - #include -+ -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifdef STDC_HEADERS - # include - # include -diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c -index cd359a9..33e1630 100644 ---- a/bin/fribidi-main.c -+++ b/bin/fribidi-main.c -@@ -33,6 +33,11 @@ - #include - - #include -+ -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifdef STDC_HEADERS - # include - # include -diff --git a/gen.tab/gen-arabic-shaping-tab.c b/gen.tab/gen-arabic-shaping-tab.c -index e613768..369501c 100644 ---- a/gen.tab/gen-arabic-shaping-tab.c -+++ b/gen.tab/gen-arabic-shaping-tab.c -@@ -30,6 +30,10 @@ - #include - - #include -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifdef STDC_HEADERS - # include - # include -diff --git a/gen.tab/gen-bidi-type-tab.c b/gen.tab/gen-bidi-type-tab.c -index a0a61ef..05b1d16 100644 ---- a/gen.tab/gen-bidi-type-tab.c -+++ b/gen.tab/gen-bidi-type-tab.c -@@ -30,6 +30,10 @@ - #include - - #include -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifdef STDC_HEADERS - # include - # include -diff --git a/gen.tab/gen-brackets-tab.c b/gen.tab/gen-brackets-tab.c -index 8c1f1df..cd99e01 100644 ---- a/gen.tab/gen-brackets-tab.c -+++ b/gen.tab/gen-brackets-tab.c -@@ -32,6 +32,10 @@ - #include - - #include -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifdef STDC_HEADERS - # include - # include -diff --git a/gen.tab/gen-brackets-type-tab.c b/gen.tab/gen-brackets-type-tab.c -index 221db07..9ec60cc 100644 ---- a/gen.tab/gen-brackets-type-tab.c -+++ b/gen.tab/gen-brackets-type-tab.c -@@ -32,6 +32,10 @@ - #include - - #include -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifdef STDC_HEADERS - # include - # include -diff --git a/gen.tab/gen-joining-type-tab.c b/gen.tab/gen-joining-type-tab.c -index 07c0953..29ab3ed 100644 ---- a/gen.tab/gen-joining-type-tab.c -+++ b/gen.tab/gen-joining-type-tab.c -@@ -30,6 +30,10 @@ - #include - - #include -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifdef STDC_HEADERS - # include - # include -diff --git a/gen.tab/gen-mirroring-tab.c b/gen.tab/gen-mirroring-tab.c -index 21d33cf..e19be91 100644 ---- a/gen.tab/gen-mirroring-tab.c -+++ b/gen.tab/gen-mirroring-tab.c -@@ -30,6 +30,10 @@ - #include - - #include -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifdef STDC_HEADERS - # include - # include -diff --git a/gen.tab/gen-unicode-version.c b/gen.tab/gen-unicode-version.c -index 4291551..35306ca 100644 ---- a/gen.tab/gen-unicode-version.c -+++ b/gen.tab/gen-unicode-version.c -@@ -28,6 +28,10 @@ - #include - - #include -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifdef STDC_HEADERS - # include - # include -diff --git a/lib/bidi-types.h b/lib/bidi-types.h -index 385ef05..86f3d02 100644 ---- a/lib/bidi-types.h -+++ b/lib/bidi-types.h -@@ -27,7 +27,7 @@ - #ifndef _BIDI_TYPES_H - #define _BIDI_TYPES_H - --#include "common.h" -+#include "fribidi-common.h" - - #include - #include -diff --git a/lib/fribidi-arabic.c b/lib/fribidi-arabic.c -index dbfdc09..e12074c 100644 ---- a/lib/fribidi-arabic.c -+++ b/lib/fribidi-arabic.c -@@ -27,6 +27,10 @@ - - #include "common.h" - -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #ifdef HAVE_STDLIB_H - # include - #endif -diff --git a/lib/fribidi-types.h b/lib/fribidi-types.h -index 9f1746f..90238b4 100644 ---- a/lib/fribidi-types.h -+++ b/lib/fribidi-types.h -@@ -27,10 +27,6 @@ - #ifndef _FRIBIDI_TYPES_H - #define _FRIBIDI_TYPES_H - --#ifdef HAVE_CONFIG_H --# include --#endif -- - #include "fribidi-common.h" - - #include "fribidi-begindecls.h" -diff --git a/lib/joining-types.h b/lib/joining-types.h -index 94b9fe3..6e11fa1 100644 ---- a/lib/joining-types.h -+++ b/lib/joining-types.h -@@ -27,7 +27,7 @@ - #ifndef _JOINING_TYPES_H - #define _JOINING_TYPES_H - --#include "common.h" -+#include "fribidi-common.h" - - #include - #include -diff --git a/lib/run.h b/lib/run.h -index 8c4e259..44ddfec 100644 ---- a/lib/run.h -+++ b/lib/run.h -@@ -29,7 +29,7 @@ - #ifndef _RUN_H - #define _RUN_H - --#include "common.h" -+#include "fribidi-common.h" - - #include - diff --git a/dev-libs/fribidi/fribidi-1.0.5-r1337.ebuild b/dev-libs/fribidi/fribidi-1.0.5-r1337.ebuild deleted file mode 100644 index 3ca3bd09..00000000 --- a/dev-libs/fribidi/fribidi-1.0.5-r1337.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit meson multilib-minimal - -DESCRIPTION="A free implementation of the unicode bidirectional algorithm" -HOMEPAGE="https://fribidi.org/" -SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz2" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - virtual/pkgconfig[${MULTILIB_USEDEP}]" - -PATCHES=( "${FILESDIR}"/no-config-h.diff ) - -multilib_src_configure() { - local emesonargs=( - -Ddocs=false - ) - meson_src_configure -} - -multilib_src_install() { - meson_src_install -} diff --git a/x11-libs/gtk+/gtk+-2.24.32-r314.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r314.ebuild index dd921c55..8f777d0d 100644 --- a/x11-libs/gtk+/gtk+-2.24.32-r314.ebuild +++ b/x11-libs/gtk+/gtk+-2.24.32-r314.ebuild @@ -60,7 +60,7 @@ DEPEND="${COMMON_DEPEND} dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + >=virtual/pkgconfig-0-r1 !aqua? ( x11-base/xorg-proto ) test? ( x11-themes/hicolor-icon-theme diff --git a/x11-libs/gtk+/gtk+-3.24.5-r314.ebuild b/x11-libs/gtk+/gtk+-3.24.5-r314.ebuild index bd9020ce..3372fa89 100644 --- a/x11-libs/gtk+/gtk+-3.24.5-r314.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.5-r314.ebuild @@ -74,7 +74,7 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.20 gtk-doc? ( >=dev-util/gtk-doc-1.20 ) >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] - virtual/pkgconfig[${MULTILIB_USEDEP}] + virtual/pkgconfig X? ( x11-base/xorg-proto ) test? ( media-fonts/font-misc-misc -- cgit v1.2.3