[gentoo-commits] repo/gentoo:master commit in: x11-misc/macopix/files/, x11-misc/macopix/

[Andreas Sturmlechner]

commit:     6b309d2d9eb4eb57c7d5e7668ce6648c994f37f7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 15 20:13:01 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 16 19:10:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b309d2d

x11-misc/macopix: Drop 1.7.4

Closes: https://bugs.gentoo.org/769134
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 x11-misc/macopix/Manifest                          |  1 -
 x11-misc/macopix/files/macopix-1.7.4-windres.patch | 58 ---------------
 x11-misc/macopix/macopix-1.7.4-r1.ebuild           | 86 ----------------------
 x11-misc/macopix/macopix-1.7.4-r2.ebuild           | 83 ---------------------
 4 files changed, 228 deletions(-)

diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index 560229d73c8..a43d64dec42 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -1,4 +1,3 @@
-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

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 e26bf62e7b7..00000000000
--- 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/macopix-1.7.4-r1.ebuild b/x11-misc/macopix/macopix-1.7.4-r1.ebuild
deleted file mode 100644
index 2d547a63583..00000000000
--- 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 21fa93789d0..00000000000
--- 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
-}