From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Oct 2021 10:22:14 +0100 Subject: gentoo resync : 20.10.2021 --- app-i18n/libkkc/Manifest | 7 ++- app-i18n/libkkc/files/libkkc-marisa-glib.patch | 23 ++++++++ app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild | 68 ++++++++++++++++++++++ .../libkkc/libkkc-0.3.6_pre20190809104047.ebuild | 67 --------------------- app-i18n/libkkc/libkkc-9999.ebuild | 33 ++++++----- 5 files changed, 112 insertions(+), 86 deletions(-) create mode 100644 app-i18n/libkkc/files/libkkc-marisa-glib.patch create mode 100644 app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild delete mode 100644 app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild (limited to 'app-i18n/libkkc') diff --git a/app-i18n/libkkc/Manifest b/app-i18n/libkkc/Manifest index 46681b867e67..0b335e9eac0f 100644 --- a/app-i18n/libkkc/Manifest +++ b/app-i18n/libkkc/Manifest @@ -1,4 +1,5 @@ -DIST libkkc-0.3.6_pre20190809104047.tar.gz 389976 BLAKE2B 03c43384f4f1f0e48a3eec2afb9f90a39e42469439a7dbc06692e020d83b8362f19c41ea8960cd5147edca04dcf67be5e74315f494dd017a6ce018f217b6a5a7 SHA512 87c5294900b29e4b2225c24ee744c619691a5f25edc453c2ece44133695a8d0e1a1a07bb5a00d615cc95057ae5b451c845c7ce476df555e025097c38aff87a69 -EBUILD libkkc-0.3.6_pre20190809104047.ebuild 1514 BLAKE2B 2c812e21be1734a9403ea270be1c815bfa7aad6b9e689a71ae97d731bcf07e7cc6d6efa43b32450f546c8540f4e8247c7066f3d7bed0946a6625c552db601a0f SHA512 b1b04062b2e8ad9f8220b99dc8e21baf87918951b99b11f2664349a6b0e38dcd28ac4777bd32a965b5e0f96f02d4e830874965e6635711626cced3ec2e6f8d93 -EBUILD libkkc-9999.ebuild 1463 BLAKE2B d584b34083dda535e540197f39a519b60f16ee1b1192b433945e44e07f79a805d5b4ab548c0d6e783df0959312eded5ba629a468eadbec5d2ef9115e8929414b SHA512 98459cbeb3a17a2affb401f180ad52a8cc7892accc5ae7fe1a66717dec6743a96de96fc921bc42e3b196ab3b156ad901d1ec31f9323424d4f30d48b7c4626537 +AUX libkkc-marisa-glib.patch 714 BLAKE2B dfe2c8c3f3fe0de904678a21890d99c548d08c2f79c9a2a5bf54080529336a0afe9ad1ef613fd1c2a2b692a3de6edd17e15a7434cb4c677660c035badc303c2a SHA512 b5f5f2158329b883709242bf7415fe91d1637f1ae6f8620ddf1b872b652292bda237b92ff1c0595168f3eb2b9b33cb48e33f02bcebd031081f2dff0b8493509f +DIST libkkc-0.3.5_p20210928.tar.gz 390022 BLAKE2B d4b44861f4526f4f9581cd9343fb4d8dd361967cce153ab92fb9a3334502bd583081d4ae3c01879c94aee710d347c23d3372c0deb20d711b9792eb73a28b3beb SHA512 9c46ef09242ecf3d4864fff0e7df7ff362d71c382bb92fe1e784bd20bdf737dc6a528b57342093ab4415926b15f09db44a10b8088d1c9f8b9cebcb428aaee8c6 +EBUILD libkkc-0.3.5_p20210928.ebuild 1506 BLAKE2B 85943d5a57b656474f946449f72c2d9b8ad6c99345d2740bf34da023a4c8733e31a8e059c0bdb54bb7b44f701faacdc018b72c36b2697331596dc33c5fcd0c71 SHA512 f846510ef6de2f1cf2673ac62f9a068bac1b7fe27a38d2d7e8097c06526d45e507e0102022f6607b9a4e2d40b6929bed94ccedb755f9c93a06694c49449804ff +EBUILD libkkc-9999.ebuild 1455 BLAKE2B 1fb2ca9fb62b7146abe5da7e49f11463824b5b83c8f8d99b572183d017b62e3983793c4745ffc1d8e45f82b7dcf8e76414644943d9d627c8032da3f68f1eec2b SHA512 52bd3c5257d28ae2a62b1c873d9f378cffa7007c77fe168a8decc7ed817d8eeca7fef5b82f82bdf431046290f1075c0432bbc936fc332aaf465412d02dcb3d46 MISC metadata.xml 459 BLAKE2B fa914e2f676f1065402ac064f0253cd3ad5a97af0fa72f333bf312b033a1d8c7c40be04f6d9626afa4ad0b67c5cdfd6da4c75e0d261cfafcbe5010e8c994e4ec SHA512 8483db54ccb88733e541875f527350354c48bb258b7a7eb18f8d092eb4a1906082072178ad9ab371039dfc8dd2b2727dc4c269e5089f648a0bd03a3ee1233bf7 diff --git a/app-i18n/libkkc/files/libkkc-marisa-glib.patch b/app-i18n/libkkc/files/libkkc-marisa-glib.patch new file mode 100644 index 000000000000..2b013d4f5779 --- /dev/null +++ b/app-i18n/libkkc/files/libkkc-marisa-glib.patch @@ -0,0 +1,23 @@ +--- a/libkkc/Makefile.am ++++ b/libkkc/Makefile.am +@@ -49,7 +49,11 @@ + -DLOCALEDIR=\"$(datadir)/locale\" \ + -I $(top_srcdir) \ + $(NULL) +-libkkc_la_LIBADD = $(LIBKKC_LIBS) $(top_builddir)/marisa-glib/libmarisa-glib.la ++libkkc_la_LIBADD = \ ++ $(LIBKKC_LIBS) \ ++ $(top_builddir)/marisa-glib/libmarisa-glib.la \ ++ $(MARISA_GLIB_STATIC_DEPENDENCIES) \ ++ $(NULL) + libkkc_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ +@@ -66,7 +70,6 @@ + libkkc_internals_la_LIBADD = \ + $(libkkc_la_LIBADD) \ + $(libkkc_la_OBJECTS) \ +- $(MARISA_GLIB_STATIC_DEPENDENCIES) \ + $(NULL) + libkkc_internals_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ diff --git a/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild b/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild new file mode 100644 index 000000000000..fec5bceb750c --- /dev/null +++ b/app-i18n/libkkc/libkkc-0.3.5_p20210928.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python3_{7..10} ) + +inherit autotools python-any-r1 vala + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/ueno/libkkc" +elif [[ "${PV}" == *_p* ]]; then + inherit vcs-snapshot + + EGIT_COMMIT="cdcaf4dceaf273bfe7b018a4a651a92f786c6ec6" +fi + +DESCRIPTION="Japanese Kana Kanji conversion input method library" +HOMEPAGE="https://github.com/ueno/libkkc" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +elif [[ "${PV}" == *_p* ]]; then + SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" +else + SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz" +fi + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="nls static-libs" + +RDEPEND="app-i18n/libkkc-data + dev-libs/glib:2 + dev-libs/json-glib + dev-libs/libgee:0.8 + dev-libs/marisa + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') + $(vala_depend) + dev-libs/gobject-introspection + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch ) + +python_check_deps() { + has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" +} + +src_prepare() { + vala_src_prepare + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable static-libs static) +} + +src_install() { + default + find "${ED}" -name "*.la" -delete || die +} diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild deleted file mode 100644 index d563af26c2cd..000000000000 --- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2013-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) - -inherit autotools python-any-r1 vala - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/ueno/libkkc" -elif [[ "${PV}" == *_pre* ]]; then - LIBKKC_GIT_REVISION="b2e5a152980ee627c39ca8a49082e6df7694b8fc" -fi - -DESCRIPTION="Japanese Kana Kanji conversion input method library" -HOMEPAGE="https://github.com/ueno/libkkc" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" -else - SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz" -fi - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls static-libs" - -BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') - $(vala_depend) - dev-libs/gobject-introspection - virtual/pkgconfig - nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 - dev-libs/json-glib - dev-libs/libgee:0.8 - dev-libs/marisa - nls? ( virtual/libintl )" -RDEPEND="${DEPEND}" - -if [[ "${PV}" == *_pre* ]]; then - S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}" -fi - -python_check_deps() { - has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" -} - -src_prepare() { - default - eautoreconf - vala_src_prepare -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name "*.la" -delete || die -} diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild index 1743990197eb..cbad641cc798 100644 --- a/app-i18n/libkkc/libkkc-9999.ebuild +++ b/app-i18n/libkkc/libkkc-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 2013-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) +PYTHON_COMPAT=( python3_{7..10} ) inherit autotools python-any-r1 vala @@ -10,16 +10,18 @@ if [[ "${PV}" == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ueno/libkkc" -elif [[ "${PV}" == *_pre* ]]; then - LIBKKC_GIT_REVISION="" +elif [[ "${PV}" == *_p* ]]; then + inherit vcs-snapshot + + EGIT_COMMIT="" fi DESCRIPTION="Japanese Kana Kanji conversion input method library" HOMEPAGE="https://github.com/ueno/libkkc" if [[ "${PV}" == "9999" ]]; then SRC_URI="" -elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" +elif [[ "${PV}" == *_p* ]]; then + SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" else SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz" fi @@ -29,30 +31,29 @@ SLOT="0" KEYWORDS="" IUSE="nls static-libs" +RDEPEND="app-i18n/linkkc-data + dev-libs/glib:2 + dev-libs/json-glib + dev-libs/libgee:0.8 + dev-libs/marisa + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') $(vala_depend) dev-libs/gobject-introspection virtual/pkgconfig nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 - dev-libs/json-glib - dev-libs/libgee:0.8 - dev-libs/marisa - nls? ( virtual/libintl )" -RDEPEND="${DEPEND}" -if [[ "${PV}" == *_pre* ]]; then - S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}" -fi +PATCHES=( "${FILESDIR}"/${PN}-marisa-glib.patch ) python_check_deps() { has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" } src_prepare() { + vala_src_prepare default eautoreconf - vala_src_prepare } src_configure() { -- cgit v1.2.3