gentoo (valentine's day) resync : 14.02.2021

6 files changed, 23 insertions, 193 deletions

diff --git a/x11-misc/gtkdialog/Manifest b/x11-misc/gtkdialog/Manifest
index acffb9603571..376df08d8ef9 100644
--- a/x11-misc/gtkdialog/Manifest
+++ b/x11-misc/gtkdialog/Manifest
@@ -1,10 +1,6 @@
 AUX gtkdialog-0.8.3-do_variables_count_widgets.patch 214 BLAKE2B 7e8975b55ac8432ceeaa412b01c2a8362c1394575aadeb471ad93f6bb91e185f412c94c4c1e4122055b939723fce15efc8353587f1adc5f01d746b9143f7a5ef SHA512 befcd5644d268b734a15e8ce0d58fc410d61fca9b825cd97f14ba5000355d81684f42d6bbb65cdc84ec7fa01c3112901adb0ffabd6af0df4875f2441aa0a7235
 AUX gtkdialog-0.8.3-fno-common.patch 1535 BLAKE2B 1a881d8827c0ac815791b5bd482d1160158bbbce8a2b5a57235e1ba3131d8cb4c591f10b67fff35c5f1a632f097fa751749702b32696f1b86469629a4b4238f4 SHA512 5812ee6272bc7ffa85ea506bce9b64451c5d9a716c87272b7c5e0c166b85ac7ba7f1a8cf9c687df194b20fe0db942084b2d199cbf51093b05d204c217ea6e65c
-AUX gtkdialog-0.8.3-optdeps.patch 1573 BLAKE2B 1db31db450da622f91920611c93bd4d8cec0378ab2baab27dbb0f3ea750a6ca83ac6e0bb14ba6f4b4043ab80205d140d4b5fad6e9a120445499a4c0984577956 SHA512 a26d46716b46a909c4346c3fc3d9999991c98649ce4fc97cb6f0010dd768c81c62fec6561210dad89ef3911d2fe751c1cf321df60d5e6321647b818f8ed91475
-DIST gtkdialog-0.8.3.tar.gz 571974 BLAKE2B cfd5062ec6c255ade5467b9d6435d7529c5a55f911db8e549b19c26032aebcd1b83f2cf4ac7e2bcc9c71f9f37725c9285bbb22505ec021e7eded28ab7d382113 SHA512 fd8a93d576917efd650e38e31f261065c0a0c3f9213338ed4bd457d310993d8efbe8deabb2c1451f491d14c8d38cbcd5d4cb0c9f289c6fd462f7a06754b89da7
 DIST gtkdialog-0.8.3_p20200202.tar.xz 356312 BLAKE2B 77358e0b04ddb484e3e3a093084776a2c799fa52b90849bdde3bce56a7c042c2cbe28d699f0c4dcc14cc69872d496b89fc5c8aa7140669560e01448d9c57c15d SHA512 9120ac515eace168e4a3987b6cf3a1b3aa0e7617e837ade21d5ffea25cc3f3abbff598bb4c33914fb800416ea687f0ec7dea2b24c8acc0c71734aa6b2b385bfe
-EBUILD gtkdialog-0.8.3-r2.ebuild 897 BLAKE2B 6d445aefb7cc5825df30d4ba7e9157710bbd2266fc047efe47e8525a2899eb75879b878f9f122f067f9c4f974922c340b22e5ba6c952c5dd91d2981a030e41d6 SHA512 294e88293061c8cae807fcb95529a46b54e3a3357b28de2f67cfaaa17af8b237946871ed9fdc10f334a23fe0944190a5c7981e7e001ee104b9c6e0b6f1c57b2b
-EBUILD gtkdialog-0.8.3-r3.ebuild 994 BLAKE2B 53e7ad93fa84c2776552f11365411cf64d19a9329986501717dc4a824af23072f7acb39d1e8003eaaca714087ab39a028ee09213fe3d2792d67e551150e6c9b2 SHA512 aff4969b5d95b6a0a3a19cd37f41c8f7dd554a83fb3a0522fbedece6f1fdcfb37363f6887d2dfabb6ed3c239a72d2f7e152cf87827c9bbdebb3aba22facc1a82
-EBUILD gtkdialog-0.8.3_p20200202.ebuild 1080 BLAKE2B 1985d73e8711b8e7c68fd26db6a277fa99e2e65c910c3c0264b56ac843ae5fb54b04902af6f3fa944c42a9f5e7af09b9540ec9e7b0d5d97ae7d9e61ed53fe756 SHA512 bc7594710c9b1bc958f663d83170b93422bafad7e01dcfa135734b77d9d7f53f7eba125456ff94a191e5f10b8d676d77ba364f9fde3f36f5449e51faabef8f4a
+EBUILD gtkdialog-0.8.3_p20200202.ebuild 1077 BLAKE2B 3c64c762e7b867c6db7a7931cd0aa8eecac5fba66399a65a18e53495c8895be41c469d630cb8af20613ed204958d3a702aa98082f8e1dec3e1f21de563e7025f SHA512 d2d088500fa2411fdb1da1859e7988c133562d97ad944a4f28c95e8bc274e3a8a1687c986a0c148dc34f8c411f115f06873371f31961a0546f7a42e72ad11ce5
 EBUILD gtkdialog-99999.ebuild 1075 BLAKE2B 6c9be3e8b4ed1685a87064c09eeb807cde325619b894301bfce4bc597c8ff796d0c4e5e63a157dc8edcdb89e4ae11e25848c7e98496ab2388b17279fbc822bfe SHA512 c50630ef940040e3dc766615a19c9ac5c9cb04924d5baea9679ce152f0913ae883845841d580b8183abf619aeff7bc24af1fff17a855d4d67d5abf0a3413696e
-MISC metadata.xml 1061 BLAKE2B 0befbe35090efdcd6567b30df2263e2e9de09921b98e78ac829705d5dd667c02074b0e45816be46919cd0a4fa7e97f8b16dd619f0449257b9038daed4a10dc56 SHA512 d58b989f9601950b77e9711ba86e127c7bbe7e770322fb02cf9db26742f43d6e7f80b40cf1f59f086a7c26d1453c78a5c4143e5bb99213819167b1c602f4c11c
+MISC metadata.xml 952 BLAKE2B 3eca701ec6df8005bbdd68bb5c7b65e0719f287930cb1bdc6076e1ecf693f14193cabd4f13b004739b89a147335f1829bb715475099c35d4294366a02cf7b502 SHA512 bb020adf5f95b0001b1b68c8a8457d2638d1790e1f628b47170e51bd4af65a1801d03724e231ac0d2c69f1982f208d4a15b043f57f86fcacdb085b43a0a44e67
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch
deleted file mode 100644
index e032c1290215..000000000000
--- a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-optdeps.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,32 +25,40 @@
- AC_PROG_YACC
- AC_SUBST(YACC)
- 
-+PKG_PROG_PKG_CONFIG([0.24])
-+
- # Checks for libraries.
--pkg_modules="gtk+-2.0 >= 2.0.0"
--PKG_CHECK_MODULES(GTK, [$pkg_modules])
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0])
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- 
--pkg_modules="gthread-2.0"
--PKG_CHECK_MODULES(GTHREAD, [$pkg_modules])
-+PKG_CHECK_MODULES(GTHREAD, [gthread-2.0])
- AC_SUBST(GTHREAD_CFLAGS)
- AC_SUBST(GTHREAD_LIBS)
- 
--glade_lib="libglade-2.0"
--PKG_CHECK_MODULES([GLADE_LIB], \
--	[$glade_lib], \
--	AC_SUBST(HAVE_GLADE_LIB, 1),\
--	AC_SUBST(HAVE_GLADE_LIB, 0))
--AC_SUBST(GLADE_LIB_CFLAGS)
--AC_SUBST(GLADE_LIB_LIBS)
--
--vte_lib="vte >= 0.23.5"
--PKG_CHECK_MODULES([VTE], \
--	[$vte_lib], \
--	AC_SUBST(HAVE_VTE, 1),\
--	AC_SUBST(HAVE_VTE, 0))
--AC_SUBST(VTE_CFLAGS)
--AC_SUBST(VTE_LIBS)
-+AC_ARG_WITH([glade],
-+  AS_HELP_STRING([--with-glade], [enable support for libglade])
-+)
-+
-+AC_ARG_WITH([vte],
-+  AS_HELP_STRING([--with-vte], [enable support for vte])
-+)
-+
-+AS_IF(
-+  [test "x$with_glade" = "xyes"],
-+  [PKG_CHECK_MODULES([GLADE_LIB], [libglade-2.0], [have_glade_lib=1], AC_MSG_ERROR([glade requested but not found]))],
-+  [test "x$with_glade" = "xno"],
-+  [have_glade_lib=0]
-+)
-+AC_SUBST([HAVE_GLADE_LIB], [$have_glade_lib])
-+
-+AS_IF(
-+  [test "x$with_vte" = "xyes"],
-+  [PKG_CHECK_MODULES([VTE], [vte >= 0.23.5], [have_vte=1], AC_MSG_ERROR([vte requested but not found]))],
-+  [test "x$with_vte" = "xno"],
-+  [have_vte=0]
-+)
-+AC_SUBST([HAVE_VTE], [$have_vte])
- 
- # Checks for header files.
- AC_CHECK_HEADERS([locale.h])
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
deleted file mode 100644
index 5e5b48165a4b..000000000000
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A small utility for fast and easy GUI building"
-HOMEPAGE="https://code.google.com/p/gtkdialog/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="glade vte"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	glade? ( gnome-base/libglade )
-	vte? ( x11-libs/vte:0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	virtual/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
-	"${FILESDIR}"/${PN}-0.8.3-optdeps.patch
-)
-
-src_prepare() {
-	mv configure.{in,ac} || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with glade) $(use_with vte)
-}
-
-src_install() {
-	# Stop make install from running gtk-update-icon-cache
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
-	einstalldocs
-}
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
deleted file mode 100644
index f6947de49587..000000000000
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools xdg-utils
-
-DESCRIPTION="A small utility for fast and easy GUI building"
-HOMEPAGE="https://code.google.com/p/gtkdialog/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="glade vte"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	glade? ( gnome-base/libglade )
-	vte? ( x11-libs/vte:0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	virtual/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8.3-fno-common.patch
-	"${FILESDIR}"/${PN}-0.8.3-optdeps.patch
-)
-
-src_prepare() {
-	mv configure.{in,ac} || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with glade) $(use_with vte)
-}
-
-src_install() {
-	# Stop make install from running gtk-update-icon-cache
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
index aaa806d08243..fa5542bd4063 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gtk2"
 
 RDEPEND="
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index 7d0ca79e2c46..41363328c85b 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>desktop-misc@gentoo.org</email>
-<name>Gentoo Desktop Miscellaneous Project</name>
-</maintainer>
-<longdescription>
-gtkdialog is a GUI-creation utility that can be used with an arbitrary
-interpreter. It enables the programmer to describe a graphical user interface
-in a simple XML-like language, and use it with any interpreter that supports
-either files, standard I/O, or environment variables. It can be called as an
-external program from the interpreter, but can be used as a stand-alone
-framework for the application as well. Stand-alone, bash, and awk examples are
-provided.
-</longdescription>
-<upstream>
-<remote-id type="google-code">gtkdialog</remote-id>
-</upstream>
-<use>
-<flag name="glade">Enable support for <pkg>gnome-base/libglade</pkg></flag>
-<flag name="gtk2">Build with GTK+2 instead of GTK+3</flag>
-<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg></flag>
-</use>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<longdescription>
+		gtkdialog is a GUI-creation utility that can be used with an arbitrary
+		interpreter. It enables the programmer to describe a graphical user interface
+		in a simple XML-like language, and use it with any interpreter that supports
+		either files, standard I/O, or environment variables. It can be called as an
+		external program from the interpreter, but can be used as a stand-alone
+		framework for the application as well. Stand-alone, bash, and awk examples are
+		provided.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">oshazard/gtkdialog</remote-id>
+	</upstream>
+	<use>
+		<flag name="gtk2">Build with GTK+2 instead of GTK+3</flag>
+	</use>
 </pkgmetadata>