From 618c3037024b4e5328531cdc07c6ceb7486f5329 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 31 Dec 2017 22:30:36 +0000 Subject: gentoo resync : 31.12.2017 (final resync this year) --- app-i18n/scim-hangul/Manifest | 6 +-- .../scim-hangul/files/scim-hangul-0.4.0+gtk.patch | 4 +- app-i18n/scim-hangul/scim-hangul-0.3.2.ebuild | 46 ---------------------- app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild | 31 +++++++-------- 4 files changed, 19 insertions(+), 68 deletions(-) delete mode 100644 app-i18n/scim-hangul/scim-hangul-0.3.2.ebuild (limited to 'app-i18n/scim-hangul') diff --git a/app-i18n/scim-hangul/Manifest b/app-i18n/scim-hangul/Manifest index 96353dc753b8..548aa8186b93 100644 --- a/app-i18n/scim-hangul/Manifest +++ b/app-i18n/scim-hangul/Manifest @@ -1,8 +1,6 @@ AUX scim-hangul-0.3.2+gcc-4.3.patch 883 BLAKE2B c891bb3865510bff80e28f4f770ea4f173d414b18c6c81cbd3b92f870774f4118e1f37ca68e94a83f128f5620d16ab77abfd03b237723def6828b353713a6bb0 SHA512 f7b65475af23667110219182ec9ba235da83d27603028c8f7655c39ffe36307762e3791d3630602c1cf0b56e87300f45562426e199f39845e39832d88fa7258a AUX scim-hangul-0.3.2+gcc-4.7.patch 318 BLAKE2B 379fd21d1ce405ffac797053f0011c2b81eb4567fe4e027be5678778316ccd5c025733c281c28955fbb6f2985e6c260df2a5f953867b7096c2827c92d02a2c83 SHA512 b07a6dadf8e206fad812e184f506d034628eccf76de00729f3c8b68eb20bfc48a881a26ed78fbfa87e16dbd7164778eebe03fc7d45297462311a5386ea72da38 -AUX scim-hangul-0.4.0+gtk.patch 511 BLAKE2B e8c20179d59012bdd80ebc95a31a89a3da599b29315bc455e76e3c906207a4ea259c573d8eb3f6bb28a149b32d861f8a4029cc07b47420458ce1d4b5ca48313c SHA512 ccdcf1b6f35bc02c29cde55a89c67b1d52a716a7e2cb87f98c15140e52266aab9c2fc4b78869fa3c69472d973988c2ccfc3204965fd3ebe2142a3f9d82d6aad5 -DIST scim-hangul-0.3.2.tar.gz 1176577 BLAKE2B 80c0ad3f988615f29ee25a0143ec325a0bb892d4c18f19783519dfbbfef373515c1e09eebcccc53c12ffbafb6fff479c0ca98569025cc53862af77ab0169154d SHA512 e8905320ff8aeeddf0041987ac5a63a19fb75bea44ffc55b5d28b825e064d6881ee0187b55025d69dad35af85da86818afa3ac39f1f10991021a7fbed3e1462e +AUX scim-hangul-0.4.0+gtk.patch 438 BLAKE2B 4d76932fbd56d53eac9e0667774fa29fd884cce70a898b1f1f7f7c944766d8707d17ff73ef6f6d57923e532d554a5f66a92e32d46b71ac411f7cf3c6f189e7f1 SHA512 9e3ea01bbb73fab8a66ae52a81c976a67e6c47588f14194dfdee3acda3d493c38106344eea21584d350ebbd5eeb0dedd9ab6d08c16893e8f290d845c8d2281b1 DIST scim-hangul-0.4.0.tar.gz 456953 BLAKE2B c7c2a320d03c4f15ad048b4e036a6dcd1f34044cb82e9a8fd18be8808e3f1be6f6f198e963982d1c6b742e614da5b3b2b3e2086ea8bbe19b4118f5493ae0188c SHA512 2f0285268deac35763c67487a40b718bf846d63634701a2a68d85109f686421f2c935b1f2998487b1f017c1a5e5bf453c56933ab4984f7464e1613d7e0b3131b -EBUILD scim-hangul-0.3.2.ebuild 1048 BLAKE2B 818240e07a72b435502d67bf82ea5c965254d3152a9fa965d845f805e8a40364a81226edc24766624e3ce86d17719e75dccd7c1bce7bdb90fa08b3661fbd84fb SHA512 9e6c5ab33248ae92d34fedc05b6f5dbc3ef1811234d092717dffa7b93fc87643ccc0752ca0c9dd9df25786776588055a86c60c1c51b3bf076310e21bdfbce442 -EBUILD scim-hangul-0.4.0.ebuild 1133 BLAKE2B 48972dfe1fc92b1af1812038e2dfe410883e0a51883d1c8c11dbcef203c98f9be55f8158168a692d3dd81d6c5b2f830c9ce9c4c6f275f078faf4a8ccfd69eff8 SHA512 2645f1cbb0c7993bb7121ac7c766f048672bf854497902ac79d3fa31c0405fb0680cf8a10857d8f3ef3a96933424aac20c3a2a8933e55771a49240bf288ffd76 +EBUILD scim-hangul-0.4.0.ebuild 1065 BLAKE2B ca093b848f5bc563c59f6df461222ccdd18c3dedce18213ee9726da8f94b13a13c398123c2bc5b89c8df12a2830865f3eb33e82783ed19b33fe97a235faca074 SHA512 198f1a4f5032d6eec5132fb48b7fe934d01d2628b4c0fb55693ed53d261da22fb714a94f3a599aaa2e9c9c8a296ed0d48f0933b04960fe0485971ce3a3e25699 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7 diff --git a/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch index bc1fd4b673ee..82d9f8ee10b2 100644 --- a/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch +++ b/app-i18n/scim-hangul/files/scim-hangul-0.4.0+gtk.patch @@ -1,5 +1,5 @@ ---- src/scim_hangul_imengine_setup.cpp.orig 2012-07-08 07:52:07.000000000 -0400 -+++ src/scim_hangul_imengine_setup.cpp 2012-11-02 14:13:14.000000000 -0400 +--- a/src/scim_hangul_imengine_setup.cpp ++++ b/src/scim_hangul_imengine_setup.cpp @@ -346,7 +346,7 @@ for (i = 0; i < n; i++) { const char* name = hangul_ic_get_keyboard_name(i); diff --git a/app-i18n/scim-hangul/scim-hangul-0.3.2.ebuild b/app-i18n/scim-hangul/scim-hangul-0.3.2.ebuild deleted file mode 100644 index e2ca5068562b..000000000000 --- a/app-i18n/scim-hangul/scim-hangul-0.3.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit base - -DESCRIPTION="Hangul IMEngine for SCIM ported from imhangul" -HOMEPAGE="http://www.scim-im.org/" -SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="nls" - -RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 ) - >=app-i18n/libhangul-0.0.4 - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}/${P}+gcc-4.3.patch" - "${FILESDIR}/${P}+gcc-4.7.patch" ) - -src_configure() { - econf \ - --disable-skim-support \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog* NEWS README* -} - -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 -} diff --git a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild index 13eba035c1c6..aa37d7ea868e 100644 --- a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild +++ b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit autotools-utils +EAPI=6 DESCRIPTION="Hangul IMEngine for SCIM ported from imhangul" HOMEPAGE="http://www.scim-im.org/" @@ -14,7 +12,8 @@ SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="nls" -RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 ) +RDEPEND=" + >=app-i18n/scim-0.99.8 >=app-i18n/libhangul-0.0.4 nls? ( virtual/libintl )" DEPEND="${RDEPEND} @@ -22,23 +21,23 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" PATCHES=( - "${FILESDIR}/${PN}-0.3.2+gcc-4.3.patch" - "${FILESDIR}/${PN}-0.3.2+gcc-4.7.patch" - "${FILESDIR}/${PN}-0.4.0+gtk.patch" ) - -DOCS=(AUTHORS NEWS) + "${FILESDIR}"/${PN}-0.3.2+gcc-4.3.patch + "${FILESDIR}"/${PN}-0.3.2+gcc-4.7.patch + "${FILESDIR}"/${PN}-0.4.0+gtk.patch +) src_configure() { - local myeconfargs=( - --disable-skim-support + econf \ + --disable-skim-support \ $(use_enable nls) - ) - autotools-utils_src_configure } src_install() { - autotools-utils_src_install - dodoc ChangeLog* README* + default + dodoc ChangeLog* + + # plugin module, no point in .la files + find "${D}" -name '*.la' -delete || die } pkg_postinst() { -- cgit v1.2.3