* [gentoo-commits] repo/gentoo:master commit in: app-i18n/xcin/
@ 2019-10-07 8:59 Agostino Sarubbo
0 siblings, 0 replies; 4+ messages in thread
From: Agostino Sarubbo @ 2019-10-07 8:59 UTC (permalink / raw
To: gentoo-commits
commit: af9905207758f13666e558fe9768064f237c1222
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 7 08:59:35 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Oct 7 08:59:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af990520
app-i18n/xcin: x86 stable wrt bug #696260
Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
index 5ba8a1b13e5..61f30adb0e5 100644
--- a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
+++ b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/x/${PN}/${MY_P}.orig.tar.gz
LICENSE="XCIN GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
IUSE="debug nls unicode"
RDEPEND=">=sys-libs/db-4.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/xcin/
@ 2019-10-07 13:53 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2019-10-07 13:53 UTC (permalink / raw
To: gentoo-commits
commit: 0967509c8f1725a084db3e9a8f9b391373ec4a80
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 7 13:10:31 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 7 13:53:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0967509c
app-i18n/xcin: Drop old (EAPI=0)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild | 72 ---------------------------------
1 file changed, 72 deletions(-)
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild
deleted file mode 100644
index 44255b37feb..00000000000
--- a/app-i18n/xcin/xcin-2.5.3_pre3-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit multilib eutils autotools libtool
-
-MY_P=${PN}_2.5.2.99.pre2+cvs20030224
-
-DESCRIPTION="Chinese X Input Method"
-HOMEPAGE="http://cle.linux.org.tw/xcin/"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${MY_P}.orig.tar.gz
- mirror://debian/pool/main/x/${PN}/${MY_P}-1.4.diff.gz"
-
-LICENSE="XCIN GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="debug nls unicode"
-
-RDEPEND=">=sys-libs/db-4.5
- >=app-i18n/libtabe-0.2.6
- unicode? ( media-fonts/hkscs-ming
- media-fonts/arphicfonts )
- app-i18n/libchewing
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P/_/-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${WORKDIR}"/${MY_P}-1.4.diff
- epatch "${FILESDIR}"/${P}-glibc-2.10.patch
- rm -f configure
- cd script
- elibtoolize
- eautoreconf
- mv configure ../
- cd ..
-}
-
-src_compile() {
- myconf="--with-xcin-rcdir=/etc
- --with-xcin-dir=/usr/$(get_libdir)/xcin25
- --with-db-lib=/usr/$(get_libdir)
- --with-tabe-inc=/usr/include/tabe
- --with-tabe-lib=/usr/$(get_libdir)
- $(use_enable debug)"
-
- econf ${myconf}
- emake -j1 || die "emake failed."
-}
-
-src_install() {
- emake \
- prefix="${D}/usr" \
- program_prefix="${D}" \
- install || die
-
- for docdir in doc doc/En doc/En/internal doc/history doc/internal doc/modules; do
- docinto ${docdir#doc/}
- if use unicode; then
- for doc in $(find ${docdir} -maxdepth '1' -type 'f'); do
- iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc}
- mv ${doc}.UTF-8 ${doc}
- done
- fi
- dodoc ${docdir}/*
- done
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/xcin/
@ 2020-09-16 11:41 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-09-16 11:41 UTC (permalink / raw
To: gentoo-commits
commit: 0a7b0ae182e07e30d40cb4e1178f4710469a0ac6
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 11:40:33 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 11:40:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a7b0ae1
app-i18n/xcin: Port to EAPI 7
Closes: https://bugs.gentoo.org/742044
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild | 70 +++++++++++++++++++--------------
1 file changed, 40 insertions(+), 30 deletions(-)
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
index 3950d850a1c..dcd1696d1c4 100644
--- a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
+++ b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
-inherit multilib eutils autotools libtool
+EAPI=7
+
+inherit autotools
MY_P=${PN}_2.5.2.99.pre2+cvs20030224
DESCRIPTION="Chinese X Input Method"
HOMEPAGE="http://cle.linux.org.tw/xcin/"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${MY_P}.orig.tar.gz
+SRC_URI="
+ mirror://debian/pool/main/x/${PN}/${MY_P}.orig.tar.gz
mirror://debian/pool/main/x/${PN}/${MY_P}-1.4.diff.gz"
LICENSE="XCIN GPL-2"
@@ -16,38 +18,42 @@ SLOT="0"
KEYWORDS="~amd64 ppc x86"
IUSE="debug nls unicode"
-RDEPEND=">=sys-libs/db-4.5
- >=app-i18n/libtabe-0.2.6
- unicode? ( media-fonts/hkscs-ming
- media-fonts/arphicfonts )
+RDEPEND="
app-i18n/libchewing
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+ >=app-i18n/libtabe-0.2.6
+ >=sys-libs/db-4.5
+ x11-libs/libX11
+ unicode? ( media-fonts/arphicfonts )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
S="${WORKDIR}/${MY_P/_/-}"
+PATCHES=(
+ "${WORKDIR}"/${MY_P}-1.4.diff
+ "${FILESDIR}"/${P}-glibc-2.10.patch
+ "${FILESDIR}"/${P}-make.patch
+ "${FILESDIR}"/${P}-ldflags.patch
+)
+
src_prepare() {
- epatch \
- "${WORKDIR}"/${MY_P}-1.4.diff \
- "${FILESDIR}"/${P}-glibc-2.10.patch \
- "${FILESDIR}"/${P}-make.patch \
- "${FILESDIR}"/${P}-ldflags.patch
- rm -f configure
- cd script
- elibtoolize
+ default
+
+ rm configure || die
+ cd script || die
+ mv configure.{in,ac} || die
eautoreconf
- mv configure ../
+ mv configure .. || die
}
src_configure() {
econf \
--disable-static \
- --with-xcin-rcdir="${EPREFIX}/etc" \
- --with-xcin-dir="${EPREFIX}/usr/$(get_libdir)/xcin25" \
- --with-db-lib="${EPREFIX}/usr/$(get_libdir)" \
- --with-tabe-inc="${EPREFIX}/usr/include/tabe" \
- --with-tabe-lib="${EPREFIX}/usr/$(get_libdir)" \
+ --with-xcin-rcdir="${EPREFIX}"/etc \
+ --with-xcin-dir="${EPREFIX}"/usr/$(get_libdir)/xcin25 \
+ --with-db-lib="${EPREFIX}"/usr/$(get_libdir) \
+ --with-tabe-inc="${EPREFIX}"/usr/include/tabe \
+ --with-tabe-lib="${EPREFIX}"/usr/$(get_libdir) \
$(use_enable debug)
}
@@ -61,16 +67,20 @@ src_install() {
program_prefix="${D}" \
install
- find "${ED}" -name "*.la" -type f -delete || die
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
+ local docdir
for docdir in doc doc/En doc/En/internal doc/history doc/internal doc/modules; do
docinto ${docdir#doc/}
- for doc in $(find ${docdir} -maxdepth '1' -type 'f'); do
+
+ local doc
+ while IFS="" read -d $'\0' -r doc; do
if use unicode; then
- iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc}
- mv ${doc}.UTF-8 ${doc}
+ iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc} || die
+ mv ${doc}.UTF-8 ${doc} || die
fi
dodoc ${doc}
- done
+ done < <(find ${docdir} -maxdepth '1' -type f -print0)
done
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/xcin/
@ 2020-09-16 13:52 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-09-16 13:52 UTC (permalink / raw
To: gentoo-commits
commit: b7b98ec6fffad48639f382832b5d959d2b720616
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 13:52:14 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 13:52:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b98ec6
app-i18n/xcin: Fix MissingSlotDep
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
index dcd1696d1c4..e71f3998511 100644
--- a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
+++ b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild
@@ -21,7 +21,7 @@ IUSE="debug nls unicode"
RDEPEND="
app-i18n/libchewing
>=app-i18n/libtabe-0.2.6
- >=sys-libs/db-4.5
+ >=sys-libs/db-4.5:*
x11-libs/libX11
unicode? ( media-fonts/arphicfonts )"
DEPEND="${RDEPEND}"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-16 13:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-07 13:53 [gentoo-commits] repo/gentoo:master commit in: app-i18n/xcin/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2020-09-16 13:52 David Seifert
2020-09-16 11:41 David Seifert
2019-10-07 8:59 Agostino Sarubbo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox