gentoo resync : 22.05.2021

6 files changed, 18 insertions, 235 deletions

diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index c67c787f6570..d10a6ad2f162 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -1,9 +1,8 @@
-AUX macopix-1.7.4-windres.patch 1842 BLAKE2B 78f1ea6f8ce906c65437dcfbfec777c7c565d00fcc21619b9d71f24295297c9bfdc9bb02f8bd5ca576eb0f5d6b23b1fede712e9615c5e0658ed4368a1105d19f SHA512 02980ad64f1711d744e17d9d906349b729661f00b290218f3b03284c40181d57056174ff9eab1a53a6367d497e7d8ab519076c22995bc0261c9ab6f526a45881
 AUX macopix-3.4.0-CVE-2015-8614.patch 3701 BLAKE2B 261c5214910d76a8eaf85180aed9bc2ee8a5a4ccf24f011b4211aa2326cff3d2ed1a5aed473cac710f6abfe59737fc05549397d944038ef1cbcd7e0f7ae02119 SHA512 0ea37c298b97edb4fc600e6d86d13ba50849843f20995dc3ac62708eefade7f46397992a9c39d475dab0b39a5928f769b7f862636123dca489541a1cc8704381
 AUX macopix-3.4.0-Werror.patch 387 BLAKE2B 0f79e3cd3de0994289cf9b7ff42a849ed70e57c815cdf716892001740e5a5f6b7e335267c388329454aff6f6a62a1bc7d619c6fe7119e796a100e97565ea75fa SHA512 855be914f3e463904261bbef8b48fa35e83d213acb9c787112b1fd6a80b7f13f4bf842bc0617099bcbfae5fff05c69653adfd36e886f6d739c8106a75e78df99
 AUX macopix-3.4.0-fno-common.patch 8807 BLAKE2B b21a6ee329d43b7bec0f86303f5cc2cd49b5731792645053a97be3ee8c56ece1993dac6ab9c727a7528ffa82ab99ff669f553aae2d517fc23c7eaff0c64facb0 SHA512 92866d617ec37bd9ca9214faf199046b561bf91abda2247ffd8cc7f4cb3547ef5e7ebad90c26b32bbe5984c6b51396fa5a2dbce19ce5689b0af1a5dfebaf0cc0
+AUX macopix-3.4.0-openssl-1.1.0.patch 185 BLAKE2B 8a89ebc1a9ea5668659793a8d26e8cd930e0e05b2277f0f9cfeee6a7bff0b4b2cfef127f84695ed874b776d3515072915719fb9e6970395b3ad28794647f187f SHA512 95313728a87568338324a20c4f1340cbd576b06eb4c40ee9e862c455e1737662f526d35872dc2514fc65d1d86eebb3a5604390aa92b94bbbe3bba251b3c0d31e
 AUX macopix-3.4.0-windres.patch 271 BLAKE2B 8bec698d590413b88412b7eedc6bead1849affe54ad6e67f7b80cdce57909bb64b9aba1ca8b3629d179260b93d9094a64fbbe77ead4e9b5883f5920253749788 SHA512 c3d5b80325f18f22e14434561ef26e798b639d5a35a52d718fa5bfa408aa9c77069b979b63b23d3e7594e93fd60da6e93dab77585959ab603ca23468e216d1a4
-DIST macopix-1.7.4.tar.bz2 725481 BLAKE2B 1712dba8efe53fa78077d77faf7a84654bb87c72b6d9067484ce8b54da448326543082e2a245fbe1b61c824084744f51c0de321076a0e23586514c694840a040 SHA512 6010f98ecd3aad4325e81f037589cc4e79d857d513687f5243adb6ef3768ace5cddf4f5cdce977a75a4dc769b52bb541bdeefe92cdc012471de950ee81592db7
 DIST macopix-3.4.0.tar.gz 2854634 BLAKE2B 95ecb17588562a86db7e2c7b8c0832ebaea5b56e2c80814c365058954ce2655ac91f0109b1b0db4f7b8c1a98fde7162ee6c23fe3b2187cbeb22681714df2a595 SHA512 99b9dbbc7ca0cb3fa9c1881800e019ccae1c6439f300f479625a5b4877a0578b4a68b131ecbc0adc4a4393a867fd0ac9df7b52adaf2057f14142d1ddaf54fd53
 DIST macopix-mascot-HxB-euc-ja-0.30.tar.gz 803473 BLAKE2B 943f30f19bf2108a7e412ca0404f8c47324fc2e9bac5c13c9fcf35d6a4c9944f25afee3754898e6449f46247572c35a42cbe9f7c1b123f3e9e00fc0f33a0a260 SHA512 8897bd6d30fe3372e91d00add2a1af5d7fd7384ce7668aa9b21952d5be863d04c63af8bb98846c59f54a87af3b60acbd008f6c62b68a22038f29a07e7ba19333
 DIST macopix-mascot-comic_party-euc-ja-1.02.tar.gz 20656 BLAKE2B d2a7022cad1856dcebc7594acad449d4de1909ab7f33788b69c562c2d376427d91e993b2c4300a968566d7fed8d3a7e6f7596ef3adcc7897ed6a1c8fd3bb5815 SHA512 b71a586faef6b878c150e7e8e412c70d8d08919736695108efe2f119aaa01347befcaf222990fbaba10daa57120645e5c77b5534df0e4224feddbaa15c80ecf2
@@ -15,7 +14,5 @@ DIST macopix-mascot-one-euc-ja-1.02.tar.gz 199796 BLAKE2B 64c303704daadcd47379ea
 DIST macopix-mascot-pia2-euc-ja-1.02.tar.gz 191520 BLAKE2B 7fa81c34df02751563fff92fba5bde1d60720f659f49d714cbc5d45c93c394b9bae399c65b3950ed3defe929b9058e13bf51d08241ddacc80626e0ac4fa22d0f SHA512 4e0177ca699d9e9caea7a9b6f6d81b41a25e1f05f44c9df1ea31578ddb908fcf12e6463bb84f0536ae25df24aca712b17a0d068d74c587671bb202c8441b7f42
 DIST macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz 310099 BLAKE2B f52f2ad14cd9c76f32eb8c582bd07886f50eb6ae2615766306081ea1850b51b205b5177831ca30ab4049fd07081ff42d5dc7c9858efa49ab79a6acf2135ff9b1 SHA512 133a3446a3713192ffef84cd381065b2a99db2eb0dd18692d54e7974eb26aa63eef6d051466ddf89152f6baa8e4625ae6e7e975cf944dd12e0b6cc17c56e5673
 DIST macopix-mascot-tsukihime-euc-ja-1.02.tar.gz 616138 BLAKE2B 8616fb0f3b8e4b72c6576dfada3794dc3e387d250e3a6f64eb2b290ef793f62c43f20ef9c03d2b309f4fd3860ce828a562f28ec37ca55ce8e2831315ccbd8a63 SHA512 226a175846a1f81a5aeedab6d7b85e38903d3b85a88a4a2c9a91365ba8a149a9ee54d6174bf8c4595cbe6542d3afcebd440a4185402c2139310664059515a2c5
-EBUILD macopix-1.7.4-r1.ebuild 1813 BLAKE2B 91da4479a1a1385166ad0553b27610061e100486dd23b54dbfcdf97543aa6e180282b2f8283cbef50b3567308e9a1a3d5f611b104e46b3614083959cdcef0e97 SHA512 0d5f63840612f49787422e1a670b840db03f381d38cb686873a0bbd8e6cc86f2525b5dc826f4d003c769c03ec801920d389684fc7fa37838d78ddb4a2155f809
-EBUILD macopix-1.7.4-r2.ebuild 1794 BLAKE2B 77e5701b7376e7dd6bdca55bb0428091ccfee074db21885b1768c192f54056462afe11bafd88d6883c7c83d1b655d11b9ce1a6b20699a0b40d250de5ecf1794b SHA512 570bbe33da66bbd83c7d8292dde3033cd89c45482e4b2bffc6dedb12d1b2fc5aadf2f2eead9d1dfb4ca3f6cf1f0bfada9efa15eaeeabfbb444c7ed199b980301
-EBUILD macopix-3.4.0.ebuild 1911 BLAKE2B 4e0d5238ae726e376a0b8df95a2c9f01fa27c38edba5dca270b10548df94a8bcfcd92a15de731558743df21e00ec9903fa46ae67df36ed2cf3197d78417228f2 SHA512 01ed6a5adc73b50e5b746d06fa1d8b83f3131e35a190d7ba1045220e88acc7ac9e849a7b32d80d714c0a02f05b22037d8c54cb877b2a493532445f36953e2c62
+EBUILD macopix-3.4.0.ebuild 1966 BLAKE2B 66ccdb346db043cb04a1db46385f60a1a9fc38ea815ded291dcb9cde29dec8ad6e81c6b16cee3639a99c4ec2e1ddf01969c6d10e68959feb93d3f5133ed3e398 SHA512 0565e9ab4abb7f36152536d39debda9327f38d140709ac20128bd2c34193d9dfb6de2918dbbdf20a9771f592626593073497c361dd152b7bd3bcf885984a2d0d
 MISC metadata.xml 247 BLAKE2B 9b6f19fbcb6084773af3f04b2965ed66f9dd87ed94de032b9e88ef713ad0e980d87bf0e488ec0858ff98bdde4e2fd8e34bf9b7e3de4cd20474c0b293b7f06887 SHA512 6fb7777fe5e0553aba14e07da24c8fec5fc21ef1b032aaa4846dedf7ff71ac86e2b0e6fc931ef2fedec3073eb8114d698ec77f21edec8b4ce87e40c50620008d
diff --git a/x11-misc/macopix/files/macopix-1.7.4-windres.patch b/x11-misc/macopix/files/macopix-1.7.4-windres.patch
deleted file mode 100644
index e26bf62e7b74..000000000000
--- a/x11-misc/macopix/files/macopix-1.7.4-windres.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -145,26 +145,10 @@
- 		            [use Gtk+1.2 insted of Gtk+2]),
- 			    [use_gtk1=yes])
- 
--if test x"${use_gtk1}" = "xyes"; then
--AM_PATH_GLIB(1.2.6,,
--        AC_MSG_ERROR(Test for GLIB failed. See the file 'INSTALL' for help.),
--        gthread)
--AM_PATH_GTK(1.2.0, ,
--            AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
--AM_PATH_GDK_PIXBUF(0.7.0, ,
--              AC_MSG_ERROR(Cannot find GdkPixbuf: Is gdk-pixbuf-config in path?))
--dnl for libpng  (In the case of Gtk+2, gdk_pixbuf_save are used.)
--AC_CHECK_LIB(png,png_create_write_struct,
--        [PNGLIB_LIBS="-lz -lpng -lm"],
--        [AC_MSG_ERROR(libpng is required.)],
--	-lz -lm)
--
--else
- AM_PATH_GLIB_2_0(2.0.0,, AC_MSG_ERROR([glib-2.x is required]), gthread gobject)
- AM_PATH_GTK_2_0(2.0.0,, AC_MSG_ERROR([gtk+-2.x is required]), gthread gobject)
- AC_DEFINE(USE_GTK2,[], [Use Gtk+2.x instead of Gtk+1.x])
- PNGLIB_LIBS=""
--fi
- AC_SUBST(PNGLIB_LIBS)
- 
- 
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -9,14 +9,6 @@
- 	 bmp.h sockmsg.h codeconv.h unmime.h base64.h quoted-printable.h\
-          macopix_icon.h tar32api.h ssl.h
- 
--if HAVE_WINDRES
--MACOPIX_RES = macopix.res
--macopix.res: macopix_res.rc
--	$(WINDRES) $< -O coff -o $@
--else
--MACOPIX_RES = 
--endif
--
- EXTRA_DIST = \
- 	macopix_res.rc.in\
-         macopix.ico\
-@@ -25,9 +17,9 @@
- 	tar32.dll\
- 	libtar32.a
- 
--INCLUDES        = @GTK_CFLAGS@  @GDK_PIXBUF_CFLAGS@ $(GNUTLS_CFLAGS)\
-+INCLUDES        = @GTK_CFLAGS@ $(GNUTLS_CFLAGS)\
- 		  $(DISABLE_DEPRECATED)
--LDADD           = @GTK_LIBS@  @GDK_PIXBUF_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\
-+LDADD           = @GTK_LIBS@ $(PNGLIB_LIBS) $(WINMM_LIBS)\
-                    $(MACOPIX_RES)  $(WINSOCK_LIBS) $(UNLHA32_LIBS)  $(TAR32_LIBS) $(GNUTLS_LIBS) $(WIN32_ICONV_LIBS)
- CLEANFILES      = *~
- DISTCLEANFILES  = .deps/*.P
diff --git a/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch b/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch
new file mode 100644
index 000000000000..7d816e7d5e50
--- /dev/null
+++ b/x11-misc/macopix/files/macopix-3.4.0-openssl-1.1.0.patch
@@ -0,0 +1,10 @@
+--- a/src/http-client.c
++++ b/src/http-client.c
+@@ -516,7 +516,6 @@
+   SSL_shutdown(ssl);
+   SSL_free(ssl);
+   SSL_CTX_free(ctx);
+-  ERR_free_strings();
+   
+   close(command_socket);
+ 
diff --git a/x11-misc/macopix/macopix-1.7.4-r1.ebuild b/x11-misc/macopix/macopix-1.7.4-r1.ebuild
deleted file mode 100644
index 2d547a63583e..000000000000
--- a/x11-misc/macopix/macopix-1.7.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
-HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
-
-BASE_URI="http://rosegray.sakura.ne.jp/macopix"
-SRC_URI="${BASE_URI}/${P}.tar.bz2"
-
-# NOTE: These mascots are not redistributable on commercial CD-ROM.
-# The author granted to use them under Gentoo Linux.
-MY_MASCOTS="
-	macopix-mascot-HxB-euc-ja-0.30
-	macopix-mascot-marimite-euc-ja-2.20
-	macopix-mascot-cosmos-euc-ja-1.02
-	macopix-mascot-mizuiro-euc-ja-1.02
-	macopix-mascot-pia2-euc-ja-1.02
-	macopix-mascot-tsukihime-euc-ja-1.02
-	macopix-mascot-triangle_heart-euc-ja-1.02
-	macopix-mascot-comic_party-euc-ja-1.02
-	macopix-mascot-kanon-euc-ja-1.02
-	macopix-mascot-one-euc-ja-1.02
-"
-
-for i in ${MY_MASCOTS} ; do
-	SRC_URI+=" ${BASE_URI}/${i}.tar.gz"
-done
-
-# programme itself is GPL-2, and mascots are free-noncomm
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gnutls nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libpng:0=
-	sys-devel/gettext
-	x11-libs/gtk+:2
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-windres.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-libs -lX11
-
-	econf $(use_with gnutls)
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog* NEWS *README*
-
-	# install mascots
-	for d in ${MY_MASCOTS} ; do
-		einfo "Installing ${d}..."
-		cd "${WORKDIR}/${d}" || die
-		insinto /usr/share/"${PN}"
-		for i in *.mcpx *.menu ; do
-			doins "$i"
-		done
-		insinto /usr/share/"${PN}"/pixmap
-		for i in *.png ; do
-			doins "$i"
-		done
-		docinto "${d}"
-		dodoc README.jp
-	done
-}
diff --git a/x11-misc/macopix/macopix-1.7.4-r2.ebuild b/x11-misc/macopix/macopix-1.7.4-r2.ebuild
deleted file mode 100644
index 21fa93789d0b..000000000000
--- a/x11-misc/macopix/macopix-1.7.4-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic
-
-DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
-HOMEPAGE="http://rosegray.sakura.ne.jp/macopix/index-e.html"
-
-BASE_URI="http://rosegray.sakura.ne.jp/macopix"
-SRC_URI="${BASE_URI}/${P}.tar.bz2"
-
-# NOTE: These mascots are not redistributable on commercial CD-ROM.
-# The author granted to use them under Gentoo Linux.
-MACOPIX_MASCOTS="
-	macopix-mascot-HxB-euc-ja-0.30
-	macopix-mascot-marimite-euc-ja-2.20
-	macopix-mascot-cosmos-euc-ja-1.02
-	macopix-mascot-mizuiro-euc-ja-1.02
-	macopix-mascot-pia2-euc-ja-1.02
-	macopix-mascot-tsukihime-euc-ja-1.02
-	macopix-mascot-triangle_heart-euc-ja-1.02
-	macopix-mascot-comic_party-euc-ja-1.02
-	macopix-mascot-kanon-euc-ja-1.02
-	macopix-mascot-one-euc-ja-1.02
-"
-
-for i in ${MACOPIX_MASCOTS} ; do
-	SRC_URI+=" ${BASE_URI}/${i}.tar.gz"
-done
-
-# programme itself is GPL-2, and mascots are free-noncomm
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnutls nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libpng:0=
-	sys-devel/gettext
-	x11-libs/gtk+:2
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( dev-libs/openssl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-windres.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags -fcommon
-	append-libs -lX11
-
-	econf $(use_with gnutls)
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog* NEWS *README*
-
-	# install mascots
-	for d in ${MACOPIX_MASCOTS} ; do
-		einfo "Installing ${d}..."
-		cd "${WORKDIR}/${d}" || die
-		insinto /usr/share/"${PN}"
-		doins *.mcpx *.menu
-		insinto /usr/share/"${PN}"/pixmap
-		doins *.png
-		docinto "${d}"
-		dodoc README.jp
-	done
-}
diff --git a/x11-misc/macopix/macopix-3.4.0.ebuild b/x11-misc/macopix/macopix-3.4.0.ebuild
index b7351081a80f..530a80225d7f 100644
--- a/x11-misc/macopix/macopix-3.4.0.ebuild
+++ b/x11-misc/macopix/macopix-3.4.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
@@ -32,7 +33,7 @@ done
 # program itself is GPL-2, and mascots are free-noncomm
 LICENSE="GPL-2 free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="gnutls nls"
 
 RDEPEND="
@@ -43,15 +44,17 @@ RDEPEND="
 	!gnutls? ( dev-libs/openssl:0= )
 	x11-libs/gtk+:3
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0-CVE-2015-8614.patch
 	"${FILESDIR}"/${PN}-3.4.0-Werror.patch
 	"${FILESDIR}"/${PN}-3.4.0-fno-common.patch
 	"${FILESDIR}"/${PN}-3.4.0-windres.patch
+	"${FILESDIR}"/${PN}-3.4.0-openssl-1.1.0.patch
 )
 
 src_prepare() {