From e73d63e1fbd7843dd491de57973718bec2172345 Mon Sep 17 00:00:00 2001 From: Aaron Bauman Date: Wed, 20 Nov 2019 12:07:29 -0500 Subject: [PATCH] app-i18n/scim-wnn: drop last-rited packages includes dev-libs/wnn7sdk Signed-off-by: Aaron Bauman --- app-i18n/scim-wnn/Manifest | 1 - .../scim-wnn/files/scim-wnn-1.0.0-gcc43.patch | 22 ------ app-i18n/scim-wnn/metadata.xml | 8 --- app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild | 51 -------------- dev-libs/wnn7sdk/Manifest | 1 - dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch | 30 --------- dev-libs/wnn7sdk/files/wnn7sdk-gentoo.patch | 67 ------------------- dev-libs/wnn7sdk/files/wnn7sdk-malloc.patch | 20 ------ dev-libs/wnn7sdk/files/wnn7sdk-qa.patch | 52 -------------- dev-libs/wnn7sdk/metadata.xml | 8 --- dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild | 53 --------------- dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild | 46 ------------- profiles/package.mask | 6 -- 13 files changed, 365 deletions(-) delete mode 100644 app-i18n/scim-wnn/Manifest delete mode 100644 app-i18n/scim-wnn/files/scim-wnn-1.0.0-gcc43.patch delete mode 100644 app-i18n/scim-wnn/metadata.xml delete mode 100644 app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild delete mode 100644 dev-libs/wnn7sdk/Manifest delete mode 100644 dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch delete mode 100644 dev-libs/wnn7sdk/files/wnn7sdk-gentoo.patch delete mode 100644 dev-libs/wnn7sdk/files/wnn7sdk-malloc.patch delete mode 100644 dev-libs/wnn7sdk/files/wnn7sdk-qa.patch delete mode 100644 dev-libs/wnn7sdk/metadata.xml delete mode 100644 dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild delete mode 100644 dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild diff --git a/app-i18n/scim-wnn/Manifest b/app-i18n/scim-wnn/Manifest deleted file mode 100644 index 4884dd7d330e..000000000000 --- a/app-i18n/scim-wnn/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST scim-wnn-1.0.0.tar.gz 536488 BLAKE2B 5ae2e198bcc2d95bb6f89a57b1331f2a7fd1ad41faecad958cc9f1f011623fbcdabee40b173d17e331b5c96d2b6114d13bc1ae3ebd4605128d69e79db9a299af SHA512 2ba49d247e0dd84b4fd74dee18a2cc83468ffd2dfd98923e588e0ceee82e78c2b25b48c9d7c173f4626f93ac031bfe50764f78624fcf60770784df74bf5f7a33 diff --git a/app-i18n/scim-wnn/files/scim-wnn-1.0.0-gcc43.patch b/app-i18n/scim-wnn/files/scim-wnn-1.0.0-gcc43.patch deleted file mode 100644 index 489f2d9064e2..000000000000 --- a/app-i18n/scim-wnn/files/scim-wnn-1.0.0-gcc43.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur scim-wnn-1.0.0.orig/src/scim_wnn_imengine_setup.cpp scim-wnn-1.0.0/src/scim_wnn_imengine_setup.cpp ---- scim-wnn-1.0.0.orig/src/scim_wnn_imengine_setup.cpp 2006-03-28 12:07:31.000000000 +0900 -+++ scim-wnn-1.0.0/src/scim_wnn_imengine_setup.cpp 2009-12-08 19:32:27.000000000 +0900 -@@ -26,6 +26,7 @@ - - #define Uses_SCIM_CONFIG_BASE - -+#include - #include - - #ifdef HAVE_CONFIG_H -diff -Naur scim-wnn-1.0.0.orig/src/wnnconversion.cpp scim-wnn-1.0.0/src/wnnconversion.cpp ---- scim-wnn-1.0.0.orig/src/wnnconversion.cpp 2006-03-28 11:34:46.000000000 +0900 -+++ scim-wnn-1.0.0/src/wnnconversion.cpp 2009-12-08 19:50:26.000000000 +0900 -@@ -17,6 +17,7 @@ - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -+#include - #include "wnnconversion.h" - #include - diff --git a/app-i18n/scim-wnn/metadata.xml b/app-i18n/scim-wnn/metadata.xml deleted file mode 100644 index c921b96adf6c..000000000000 --- a/app-i18n/scim-wnn/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - cjk@gentoo.org - Cjk - - diff --git a/app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild b/app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild deleted file mode 100644 index 7526750cc069..000000000000 --- a/app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Japanese input method Wnn IMEngine for SCIM" -HOMEPAGE="http://nop.net-p.org/modules/pukiwiki/index.php?%5B%5Bscim-wnn%5D%5D" -SRC_URI="http://nop.net-p.org/files/scim-wnn/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="+freewnn" - -RDEPEND=">=app-i18n/scim-1.4[-gtk3] - dev-libs/wnn7sdk - freewnn? ( app-i18n/freewnn )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - # bug #295733 - "${FILESDIR}/${P}-gcc43.patch" -) - -src_prepare() { - default - # bug #140794 - sed -i -e 's:$LDFLAGS conftest.$ac_ext $LIBS:conftest.$ac_ext $LIBS $LDFLAGS:g' \ - configure || die "ldflags sed failed" - -# sed -i -e "s:/usr/lib/wnn7:/usr/$(get_libdir)/wnn:g" \ - sed -i -e "s:/usr/lib/wnn7:/usr/lib/wnn:g" \ - src/scim_wnn_def.h src/wnnconversion.cpp || die "sed failed" -} - -pkg_postinst() { - elog - elog "To use SCIM with both GTK2 and XIM, you should use the following" - elog "in your user startup scripts such as .gnomerc or .xinitrc:" - elog - elog "LANG='your_language' scim -d" - elog "export XMODIFIERS=@im=SCIM" - elog - if ! use freewnn ; then - ewarn - ewarn "You disabled freewnn USE flag." - ewarn "Please make sure you have wnnenvrc visible to scim-wnn." - ewarn - fi -} diff --git a/dev-libs/wnn7sdk/Manifest b/dev-libs/wnn7sdk/Manifest deleted file mode 100644 index 70811002b30a..000000000000 --- a/dev-libs/wnn7sdk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Wnn7SDK.tgz 178403 BLAKE2B 9dfccd0bcbe38cd1d782fd2b331c6349a1e1788c328dc121eb91ed362028c18661dc08d761b31722cd19fd3c76970a2566c2641488cd4b968f898f6d1e76ea76 SHA512 d6e24357c0071eb29e3a91cd3484c8fe7901a5e1537bff6632fa04eef21d0e56d7a5f3d7d899599401f607eee259cab36026321f09eea45590d00425d1963f52 diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch b/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch deleted file mode 100644 index f97845f449f1..000000000000 --- a/dev-libs/wnn7sdk/files/wnn7sdk-gcc4.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urN Wnn/etc/bdic.c Wnn-gcc4/etc/bdic.c ---- Wnn/etc/bdic.c 2001-10-17 10:37:17.000000000 +0900 -+++ Wnn-gcc4/etc/bdic.c 2006-11-06 01:31:31.000000000 +0900 -@@ -177,6 +177,14 @@ - #define max(a, b) ((a < b)? b:a) - #endif - -+#ifdef WNN_CHECK_INODE -+static int change_file_uniq1(); -+#else -+#ifdef JS -+static int change_file_uniq1(); -+#endif -+#endif -+ - /*:::DOC_START - * - * Function Name: dic_fopen -diff -urN Wnn/jlib/jl.c Wnn-gcc4/jlib/jl.c ---- Wnn/jlib/jl.c 2001-10-17 10:37:17.000000000 +0900 -+++ Wnn-gcc4/jlib/jl.c 2006-11-06 01:33:13.000000000 +0900 -@@ -297,6 +297,8 @@ - static int insert_dai_or_ikeiji(); - static int jl_dic_save_all_e_body(); - -+static void jl_disconnect_if_server_dead_body_by_jsid(); -+ - static struct wnn_buf *jl_open_lang_core(); - static struct wnn_env *jl_connect_lang_core(); - diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-gentoo.patch b/dev-libs/wnn7sdk/files/wnn7sdk-gentoo.patch deleted file mode 100644 index e203c8b5fa83..000000000000 --- a/dev-libs/wnn7sdk/files/wnn7sdk-gentoo.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- work/src/Wnn/jlib/Imakefile Wed Oct 17 10:37:17 2001 -+++ Wnn/jlib/Imakefile Sat Oct 19 17:15:25 2002 -@@ -60,9 +60,9 @@ - - LibraryObjectRule() - #if DoSharedLib --AllTarget($(OBJS) libwnn.a libwnn.so.$(SOWNN7LIBREV)) -+AllTarget($(OBJS) libwnn7.a libwnn7.so.$(SOWNN7LIBREV)) - #else --AllTarget($(OBJS) libwnn.a) -+AllTarget($(OBJS) libwnn7.a) - #endif - - -@@ -75,23 +75,23 @@ - SingleProgramTarget(kankana,kankana.o,$(WNNJLIB),) - - #if DoSharedLib --SharedLibraryTarget(wnn,$(SOWNN7LIBREV),$(OBJS),.,.) -+SharedLibraryTarget(wnn7,$(SOWNN7LIBREV),$(OBJS),.,.) - #endif --UnsharedLibraryTarget(wnn,$(UNSHAREDOBJS),unshared,..) --LintLibraryTarget(wnn,$(SRCS)) -+UnsharedLibraryTarget(wnn7,$(UNSHAREDOBJS),unshared,..) -+LintLibraryTarget(wnn7,$(SRCS)) - - - - instlib:: install - - #if DoSharedLib --InstallSharedLibrary(wnn,$(SOWNN7LIBREV),$(WNNLIBDIR)) -+InstallSharedLibrary(wnn7,$(SOWNN7LIBREV),$(WNNLIBDIR)) - #endif --InstallLibrary(wnn,$(WNNLIBDIR)) -+InstallLibrary(wnn7,$(WNNLIBDIR)) - - #if ProfileLibJlib --ProfiledLibraryTarget(wnn,$(OBJS)) --InstallLibrary(wnn_p,$(WNNLIBDIR)) -+ProfiledLibraryTarget(wnn7,$(OBJS)) -+InstallLibrary(wnn7_p,$(WNNLIBDIR)) - #endif - - #if DoSharedLib ---- work/src/config/Project.tmpl.orig Wed Oct 17 10:37:18 2001 -+++ config/Project.tmpl Sat Oct 19 18:04:30 2002 -@@ -599,7 +599,7 @@ - XWNMOJDSRC = $(XWNMOTOP)/jd - XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m - XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC) -- XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a -+ XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn7_m.a - XWNMOLIBRARIES = $(XWNMOJLIB) - XWNMODEFS = $(XVERSION) -DUSING_BUSHU - XCOMMONDIR = $(IMTOP)/XClient/Common/src ---- work/src/config/X11.tmpl~ Wed Oct 17 10:37:18 2001 -+++ config/X11.tmpl Sat Oct 19 18:08:32 2002 -@@ -599,7 +599,7 @@ - XWNMOJDSRC = $(XWNMOTOP)/jd - XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m - XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC) -- XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a -+ XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn7_m.a - XWNMOLIBRARIES = $(XWNMOJLIB) - XWNMODEFS = $(XVERSION) -DUSING_BUSHU - XCOMMONDIR = $(IMTOP)/XClient/Common/src diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-malloc.patch b/dev-libs/wnn7sdk/files/wnn7sdk-malloc.patch deleted file mode 100644 index 0a0ce4337080..000000000000 --- a/dev-libs/wnn7sdk/files/wnn7sdk-malloc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Wnn/jlib/js.c.bak 2005-01-20 12:33:10.000000000 +0900 -+++ Wnn/jlib/js.c 2005-01-20 12:33:10.000000000 +0900 -@@ -159,7 +159,7 @@ - */ - - --extern char *malloc(); -+extern void *malloc(); - - #include - #include -@@ -199,7 +199,7 @@ - #include "../etc/pwd.c" - - --char *malloc(); -+void *malloc(); - - typedef struct _host_address { - int address_len; diff --git a/dev-libs/wnn7sdk/files/wnn7sdk-qa.patch b/dev-libs/wnn7sdk/files/wnn7sdk-qa.patch deleted file mode 100644 index a41223af8e6f..000000000000 --- a/dev-libs/wnn7sdk/files/wnn7sdk-qa.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Naur src.orig/Wnn/etc/msg.c src/Wnn/etc/msg.c ---- src.orig/Wnn/etc/msg.c 2001-10-17 10:37:17.000000000 +0900 -+++ src/Wnn/etc/msg.c 2008-11-22 10:38:22.000000000 +0900 -@@ -148,6 +148,8 @@ - \t - */ - #include -+#include -+#include - #include "commonhd.h" - #include "config.h" - #include "dslib.h" -@@ -156,7 +158,7 @@ - - - static char * --bsearch(ky, bs, nel, width, compar) -+a_bsearch(ky, bs, nel, width, compar) - char *ky; - char *bs; - unsigned long nel; -@@ -244,7 +246,7 @@ - return(NULL); - if (cd->msg_bd == 0 || cd->msg_cnt == 0) - return(NULL); -- bd = (struct msg_bd *)bsearch(id, cd->msg_bd, cd->msg_cnt, -+ bd = (struct msg_bd *)a_bsearch(id, cd->msg_bd, cd->msg_cnt, - sizeof(struct msg_bd), _search); - if (bd == NULL) - return(NULL); -diff -Naur src.orig/Wnn/jlib/jl.c src/Wnn/jlib/jl.c ---- src.orig/Wnn/jlib/jl.c 2001-10-17 10:37:17.000000000 +0900 -+++ src/Wnn/jlib/jl.c 2008-11-22 10:18:36.000000000 +0900 -@@ -143,6 +143,7 @@ - #include "commonhd.h" - #include "config.h" - #include -+#include - #include - #ifdef SYSVR2 - # include -diff -Naur src.orig/Wnn/jlib/js.c src/Wnn/jlib/js.c ---- src.orig/Wnn/jlib/js.c 2001-10-17 10:37:17.000000000 +0900 -+++ src/Wnn/jlib/js.c 2008-11-22 10:27:04.000000000 +0900 -@@ -162,6 +162,7 @@ - extern char *malloc(); - - #include -+#include - #include - #ifdef UX386 - #include diff --git a/dev-libs/wnn7sdk/metadata.xml b/dev-libs/wnn7sdk/metadata.xml deleted file mode 100644 index c921b96adf6c..000000000000 --- a/dev-libs/wnn7sdk/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - cjk@gentoo.org - Cjk - - diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild deleted file mode 100644 index 455ccb1d772e..000000000000 --- a/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="Library and headers for Wnn7 client" -HOMEPAGE="http://www.omronsoft.co.jp/SP/pcunix/sdk/index.html" -SRC_URI="ftp://ftp.omronsoft.co.jp/pub/Wnn7/sdk_source/Wnn7SDK.tgz" - -LICENSE="freedist" - -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="" - -# x11 is required for imake -DEPEND="x11-misc/imake" -RDEPEND="" - -S="${WORKDIR}/src" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-malloc.patch" - epatch "${FILESDIR}/${PN}-gentoo.patch" - epatch "${FILESDIR}/${PN}-gcc4.patch" - epatch "${FILESDIR}/${PN}-qa.patch" - - # Fix path to point to Xorg directory - sed -e "s:X11R6/::g" -i config/X11.tmpl || sed "sed 1 failed" - - sed -i -e "/CONFIGSRC =/s:=.*:= /usr/$(get_libdir)/X11/config:" Makefile.ini || die "sed 2 failed" -} - -src_compile() { - emake \ - CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ - SHLIBGLOBALSFLAGS="${LDFLAGS}" \ - World -f Makefile.ini || die "make World failed" -} - -src_install() { - dolib.so Wnn/jlib/*.so* || die "dolib.so failed" - dolib.a Wnn/jlib/*.a || die "dolib.a failed" - - insinto /usr/include/${PN}/wnn - doins Wnn/include/*.h || die "doins failed" - - dodoc README -} diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild deleted file mode 100644 index e9c8516d8c5a..000000000000 --- a/dev-libs/wnn7sdk/wnn7sdk-20011017.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils - -DESCRIPTION="Library and headers for Wnn7 client" -HOMEPAGE="http://www.omronsoft.co.jp/SP/download/pcunix/sdk.html" -SRC_URI="ftp://ftp.omronsoft.co.jp/pub/Wnn7/sdk_source/Wnn7SDK.tgz" - -LICENSE="freedist" - -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="" - -# x11 is required for imake -DEPEND="x11-misc/imake" -RDEPEND="" - -S="${WORKDIR}/src" - -src_unpack() { - unpack ${A} - cd ${S} - epatch "${FILESDIR}/${PN}-malloc.patch" - epatch "${FILESDIR}/${PN}-gentoo.patch" - epatch "${FILESDIR}/${PN}-gcc4.patch" -} - -src_compile() { - make World -f Makefile.ini || die "make World failed" -} - -src_install() { - cd ${S}/Wnn/jlib - dolib.so *.so* || die - dolib.a *.a || die - - cd ${S}/Wnn/include - insinto /usr/include/${PN}/wnn - doins *.h || die - - dodoc ${S}/README -} diff --git a/profiles/package.mask b/profiles/package.mask index e1a51b216443..36cfab8482cb 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -341,12 +341,6 @@ www-servers/thin # Removal in 30 days. Bug #697376. app-text/scrollkeeper -# David Seifert (2019-10-19) -# EAPI 0, broken build system, unmaintained, -# Removal in 30 days. Bug #679304, #688906, #697356. -app-i18n/scim-wnn -dev-libs/wnn7sdk - # Michał Górny (2019-10-19) # sci-chemistry/ccpn is unfetchable and mirror-restricted. # sci-chemistry/aria is its reverse dependency which can't be installed -- 2.26.2