app-i18n/xsunpinyin: update to EAPI 6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

2 files changed, 14 insertions, 23 deletions

diff --git a/app-i18n/xsunpinyin/files/README.gentoo b/app-i18n/xsunpinyin/files/README.gentoo
deleted file mode 100644
index 7de1985c1f32..000000000000
--- a/app-i18n/xsunpinyin/files/README.gentoo
+++ /dev/null
@@ -1,5 +0,0 @@
-To use sunpinyin with XIM, you should use the following in your user startup
-scripts such as .xinitrc or .xprofile:
-
-XMODIFIERS=@im=xsunpinyin ; export XMODIFIERS
-
diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild
index 0204cd1b1211..4b662fbfffb7 100644
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20130108.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit readme.gentoo scons-utils toolchain-funcs
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
 
-DESCRIPTION="The SunPinyin IMEngine Wrapper for XIM Framework"
+inherit python-any-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="A standalone XIM server for SunPinyin"
 HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
 SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-${PV}.tar.xz"
 
@@ -13,30 +15,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="~app-i18n/sunpinyin-${PV}:=
+RDEPEND="~app-i18n/sunpinyin-${PV}:=
 	x11-libs/gtk+:2
 	x11-libs/libX11"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+S="${WORKDIR}/${P:1}"
 
-src_unpack() {
+src_prepare() {
 	default
-	mv "${WORKDIR}/sunpinyin-${PV}" "${S}" || die
-}
-
-src_configure() {
 	tc-export CXX
-	myesconsargs=( --prefix="${EPREFIX}/usr" )
 }
 
 src_compile() {
-	pushd "${S}"/wrapper/xim
-	escons
-	popd
+	escons -C wrapper/xim \
+		--prefix="${EPREFIX}"/usr
 }
 
 src_install() {
-	pushd "${S}"/wrapper/xim
-	escons --install-sandbox="${D}" install
-	popd
-	readme.gentoo_create_doc
+	escons -C wrapper/xim --install-sandbox="${D}" install
+	dodoc wrapper/xim/README
 }