From 9dbfa3350dbe2b2de152c5c97352ff588fbeb4cf Mon Sep 17 00:00:00 2001 From: Aaron Bauman Date: Sun, 27 May 2018 16:01:50 -0400 Subject: [PATCH] app-i18n/scim-wnn: bump EAPI and drop eutils Package-Manager: Portage-2.3.40, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/8628 --- app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) 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 index 95bd20d4fbb0..10a86dd593e5 100644 --- a/app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild +++ b/app-i18n/scim-wnn/scim-wnn-1.0.0-r1.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" - -inherit eutils +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" @@ -21,7 +19,13 @@ DEPEND="${RDEPEND} virtual/pkgconfig >=sys-apps/sed-4" +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" @@ -29,15 +33,6 @@ src_prepare() { # 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" - - # bug #295733 - epatch "${FILESDIR}/${P}-gcc43.patch" -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog NEWS README || die } pkg_postinst() { -- 2.26.2