[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2023-05-19 Thread Jakov Smolić 
commit: d44120959c6fb419529fd90f2cb6e7b7e526b732
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri May 19 17:06:52 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri May 19 17:06:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4412095

app-text/sdcv: Keyword 0.5.4 riscv, #906587

Signed-off-by: Jakov Smolić  gentoo.org>

 app-text/sdcv/sdcv-0.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sdcv/sdcv-0.5.4.ebuild b/app-text/sdcv/sdcv-0.5.4.ebuild
index 3687975ae493..3e098b509d52 100644
--- a/app-text/sdcv/sdcv-0.5.4.ebuild
+++ b/app-text/sdcv/sdcv-0.5.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="darkterm nls readline test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2023-05-16 Thread Sam James 
commit: 56cfc57f76ca6dc61d97b1181a01c75446fcbb49
Author: Sam James  gentoo  org>
AuthorDate: Wed May 17 00:45:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 17 00:45:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56cfc57f

app-text/sdcv: Keyword 0.5.4 arm64, #906587

Signed-off-by: Sam James  gentoo.org>

 app-text/sdcv/sdcv-0.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sdcv/sdcv-0.5.4.ebuild b/app-text/sdcv/sdcv-0.5.4.ebuild
index 024ea78f7fd4..05d63cac1877 100644
--- a/app-text/sdcv/sdcv-0.5.4.ebuild
+++ b/app-text/sdcv/sdcv-0.5.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="darkterm nls readline test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2023-05-16 Thread Sam James 
commit: ba048ef83b1d8eb8bdf352e5fcdc6b6f19040e3a
Author: Sam James  gentoo  org>
AuthorDate: Wed May 17 00:45:05 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 17 00:45:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba048ef8

app-text/sdcv: Keyword 0.5.4 arm, #906587

Signed-off-by: Sam James  gentoo.org>

 app-text/sdcv/sdcv-0.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sdcv/sdcv-0.5.4.ebuild b/app-text/sdcv/sdcv-0.5.4.ebuild
index 05d63cac1877..3687975ae493 100644
--- a/app-text/sdcv/sdcv-0.5.4.ebuild
+++ b/app-text/sdcv/sdcv-0.5.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="darkterm nls readline test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2023-01-21 Thread Arthur Zamarin 
commit: b5e4814c29ac6774c3360f6b704d1aa140ca6170
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan 21 15:11:18 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan 21 15:11:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e4814c

app-text/sdcv: Stabilize 0.5.4 x86, #888464

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-text/sdcv/sdcv-0.5.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/sdcv/sdcv-0.5.4.ebuild b/app-text/sdcv/sdcv-0.5.4.ebuild
index 9e284963abb1..024ea78f7fd4 100644
--- a/app-text/sdcv/sdcv-0.5.4.ebuild
+++ b/app-text/sdcv/sdcv-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="darkterm nls readline test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2022-12-25 Thread Sam James 
commit: 771e1e46032df250e26b5b92278d050bc46ec20c
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 26 03:54:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 26 03:54:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=771e1e46

app-text/sdcv: Stabilize 0.5.4 amd64, #888464

Signed-off-by: Sam James  gentoo.org>

 app-text/sdcv/sdcv-0.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sdcv/sdcv-0.5.4.ebuild b/app-text/sdcv/sdcv-0.5.4.ebuild
index e345ee7b990d..9e284963abb1 100644
--- a/app-text/sdcv/sdcv-0.5.4.ebuild
+++ b/app-text/sdcv/sdcv-0.5.4.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="darkterm nls readline test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2022-10-28 Thread Andrew Savchenko 
commit: 8d58a50fde15795f515be38d6c7e34c8f9a76f4d
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Fri Oct 28 14:32:47 2022 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Fri Oct 28 14:34:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d58a50f

app-text/sdcv: add 0.5.4

Closes: https://bugs.gentoo.org/865915
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/sdcv/Manifest  |  1 +
 app-text/sdcv/sdcv-0.5.4.ebuild | 73 +
 2 files changed, 74 insertions(+)

diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index a57a7f83880a..6bd392c99eb6 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1 +1,2 @@
 DIST sdcv-0.5.3.tar.gz 62105 BLAKE2B 
1424510cff2fa355d17884a31f8136f4c8a7bde071f387dd8a69b1d2d6b9c8e52869cd602b27b9966725370cf128fb62b8628e735f1faa92b78f75215462804f
 SHA512 
73a305baad74d0584912e115d3de7395c8e88745fb69b4e5f1a345061629b0d4e05898bd589e96ce07948d52ba7c508ec4ab77862c8fadca5a2f19c5244e1442
+DIST sdcv-0.5.4.tar.gz 66706 BLAKE2B 
9cb481f497483b502bec18765b9cbc31e8dd278e30ebd29005158a724669e171181a82c837b63016b9e88a84973831587d2b137bbbdb2290a89a73d3f0917f81
 SHA512 
6bae3a2c0f37ed9380f54715626efeea0df75d2525baa583c0915bba4d082d9ece40ee799a1e1bb5d36b7ccebace853653b6fab57d472a432b910f690235ee21

diff --git a/app-text/sdcv/sdcv-0.5.4.ebuild b/app-text/sdcv/sdcv-0.5.4.ebuild
new file mode 100644
index ..e345ee7b990d
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs fr ru sk uk zh_CN zh_TW"
+inherit cmake plocale
+
+DESCRIPTION="Console version of Stardict program"
+HOMEPAGE="https://dushistov.github.io/sdcv/;
+SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="darkterm nls readline test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/glib-2.36
+   sys-libs/zlib
+   readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   nls? ( >=sys-devel/gettext-0.14.1 )
+   test? ( app-misc/jq )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.5.3-t_list.patch"
+   "${FILESDIR}/${PN}-t_interactive.patch"
+)
+
+src_prepare() {
+   if use darkterm; then
+   sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
+   fi
+
+   rm_loc() {
+   rm "po/${1}.po" || die
+   }
+   plocale_for_each_disabled_locale rm_loc
+
+   # do not install locale-specific man pages unless asked to
+   if ! has uk ${LINGUAS-uk}; then
+   sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
+   fi
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_NLS="$(usex nls)"
+   -DWITH_READLINE="$(usex readline)"
+   -DBUILD_TESTS="$(usex test ON OFF)"
+   )
+   cmake_src_configure
+}
+
+src_compile() {
+   cmake_src_compile
+   use nls && cmake_src_compile lang
+}
+
+src_install() {
+   # with USE=nls, but empty intersection of LINGUAS and list of
+   # supported translations, this directory is required, see bug 583386
+   mkdir -p "${BUILD_DIR}/locale"
+   cmake_src_install
+   dodoc doc/DICTFILE_FORMAT
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/files/, app-text/sdcv/

2021-05-06 Thread Andrew Savchenko 
commit: 8d48c7d979da991bcdb9abf10fccd3672ec6c8dc
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Thu May  6 11:06:43 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Thu May  6 11:09:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d48c7d9

app-text/sdcv: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/sdcv/Manifest|  1 -
 app-text/sdcv/files/sdcv-t_list.patch | 17 
 app-text/sdcv/sdcv-0.5.2.ebuild   | 74 ---
 3 files changed, 92 deletions(-)

diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index 3800567f539..a57a7f83880 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,2 +1 @@
-DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 
3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00
 SHA512 
8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
 DIST sdcv-0.5.3.tar.gz 62105 BLAKE2B 
1424510cff2fa355d17884a31f8136f4c8a7bde071f387dd8a69b1d2d6b9c8e52869cd602b27b9966725370cf128fb62b8628e735f1faa92b78f75215462804f
 SHA512 
73a305baad74d0584912e115d3de7395c8e88745fb69b4e5f1a345061629b0d4e05898bd589e96ce07948d52ba7c508ec4ab77862c8fadca5a2f19c5244e1442

diff --git a/app-text/sdcv/files/sdcv-t_list.patch 
b/app-text/sdcv/files/sdcv-t_list.patch
deleted file mode 100644
index 8bd23892fc7..000
--- a/app-text/sdcv/files/sdcv-t_list.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 sdcv-0.5.2/tests/t_list.orig   2017-08-16 10:14:23.0 +0300
-+++ sdcv-0.5.2/tests/t_list2018-08-26 15:12:31.501052398 +0300
-@@ -1,11 +1,10 @@
- #!/bin/sh
- 
- PATH_TO_SDCV="$1"
--ndicts=`"$PATH_TO_SDCV" -l | wc -l`
-+TEST_DIR="$2"
-+ndicts=`"$PATH_TO_SDCV" --data-dir "${TEST_DIR}" -l | wc -l`
- ndicts=$(($ndicts-1))
--ncom=`find /usr/share/stardict/dic -name "*.ifo" | wc -l`
--nspe=`find "${HOME}"/.stardict/dic -name "*.ifo" | wc -l`
--nmy=$(($ncom+$nspe))
-+nmy=`find "${TEST_DIR}" -name "*.ifo" | wc -l`
- 
- if [ $nmy -ne $ndicts ]; then
-   echo "should be: $nmy, we have: $ndicts" >&2

diff --git a/app-text/sdcv/sdcv-0.5.2.ebuild b/app-text/sdcv/sdcv-0.5.2.ebuild
deleted file mode 100644
index fad5dbbdeee..000
--- a/app-text/sdcv/sdcv-0.5.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs fr ru sk uk zh_CN zh_TW"
-: ${CMAKE_MAKEFILE_GENERATOR:="ninja"}
-
-inherit cmake-utils l10n
-
-DESCRIPTION="Console version of Stardict program"
-HOMEPAGE="https://dushistov.github.io/sdcv/;
-SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="darkterm nls readline test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/glib-2.6.1
-   sys-libs/zlib
-   readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-   nls? ( >=sys-devel/gettext-0.14.1 )
-   test? ( app-misc/jq )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-t_list.patch"
-   "${FILESDIR}/${PN}-t_interactive.patch"
-)
-
-src_prepare() {
-   if use darkterm; then
-   sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
-   fi
-
-   rm_loc() {
-   rm "po/${1}.po" || die
-   }
-   l10n_for_each_disabled_locale_do rm_loc
-
-   # do not install locale-specific man pages unless asked to
-   if ! has uk ${LINGUAS-uk}; then
-   sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
-   fi
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_NLS="$(usex nls)"
-   -DWITH_READLINE="$(usex readline)"
-   -DBUILD_TESTS="$(usex test ON OFF)"
-   )
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-   use nls && cmake-utils_src_compile lang
-}
-
-src_install() {
-   # with USE=nls, but empty intersection of LINGUAS and list of
-   # supported translations, this directory is required, see bug 583386
-   mkdir -p "${BUILD_DIR}/locale"
-   cmake-utils_src_install
-   dodoc doc/DICTFILE_FORMAT
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2021-05-06 Thread Sam James 
commit: 4b5c5329d4aacf017b4c88532939276e64724b51
Author: Sam James  gentoo  org>
AuthorDate: Thu May  6 10:05:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  6 10:05:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b5c5329

app-text/sdcv: Stabilize 0.5.3 x86, #774510

Signed-off-by: Sam James  gentoo.org>

 app-text/sdcv/sdcv-0.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sdcv/sdcv-0.5.3.ebuild b/app-text/sdcv/sdcv-0.5.3.ebuild
index b42ada8c52e..838b28af56f 100644
--- a/app-text/sdcv/sdcv-0.5.3.ebuild
+++ b/app-text/sdcv/sdcv-0.5.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="darkterm nls readline test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2021-05-06 Thread Sam James 
commit: 5ddc9ca94417bf3d80d05768f37a76c116bf8165
Author: Sam James  gentoo  org>
AuthorDate: Thu May  6 10:03:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  6 10:03:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ddc9ca9

app-text/sdcv: Stabilize 0.5.3 amd64, #774510

Signed-off-by: Sam James  gentoo.org>

 app-text/sdcv/sdcv-0.5.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sdcv/sdcv-0.5.3.ebuild b/app-text/sdcv/sdcv-0.5.3.ebuild
index 8b7225b3c9d..b42ada8c52e 100644
--- a/app-text/sdcv/sdcv-0.5.3.ebuild
+++ b/app-text/sdcv/sdcv-0.5.3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="darkterm nls readline test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/files/, app-text/sdcv/

2021-04-03 Thread Andrew Savchenko 
commit: beb002c292228709cf437afc2c31f2b1af1be71b
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat Apr  3 19:14:53 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat Apr  3 19:18:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beb002c2

app-text/sdcv: version bump

- Update to 0.5.3
- Bump to EAPI 7
- Migrate to cmake.eclass
- Pick up upstream patchset for binsearch speedup

Closes: https://bugs.gentoo.org/774510
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/sdcv/Manifest |   1 +
 app-text/sdcv/files/sdcv-0.5.3-t_list.patch|  19 
 app-text/sdcv/files/sdcv-synonyms-bin-search.patch | 112 +
 app-text/sdcv/sdcv-0.5.3.ebuild|  74 ++
 4 files changed, 206 insertions(+)

diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index c30f650ef31..3800567f539 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1 +1,2 @@
 DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 
3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00
 SHA512 
8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
+DIST sdcv-0.5.3.tar.gz 62105 BLAKE2B 
1424510cff2fa355d17884a31f8136f4c8a7bde071f387dd8a69b1d2d6b9c8e52869cd602b27b9966725370cf128fb62b8628e735f1faa92b78f75215462804f
 SHA512 
73a305baad74d0584912e115d3de7395c8e88745fb69b4e5f1a345061629b0d4e05898bd589e96ce07948d52ba7c508ec4ab77862c8fadca5a2f19c5244e1442

diff --git a/app-text/sdcv/files/sdcv-0.5.3-t_list.patch 
b/app-text/sdcv/files/sdcv-0.5.3-t_list.patch
new file mode 100644
index 000..c26a93522bd
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.5.3-t_list.patch
@@ -0,0 +1,19 @@
+diff --git a/tests/t_list b/tests/t_list
+index a8c92c4..c410cf2 100755
+--- a/tests/t_list
 b/tests/t_list
+@@ -1,11 +1,10 @@
+ #!/bin/sh
+ 
+ PATH_TO_SDCV="$1"
+-ndicts=`"$PATH_TO_SDCV" -l | wc -l`
++TEST_DIR="$2"
++ndicts=`"$PATH_TO_SDCV" --data-dir "${TEST_DIR}" -l | wc -l`
+ ndicts=$(($ndicts-1))
+-ncom=`find /usr/share/stardict/dic -name "*.ifo" | wc -l`
+-nspe=`find "${XDG_DATA_HOME:-$HOME/.local/share}"/stardict/dic -name "*.ifo" 
| wc -l`
+-nmy=$(($ncom+$nspe))
++nmy=`find "${TEST_DIR}" -name "*.ifo" | wc -l`
+ 
+ if [ $nmy -ne $ndicts ]; then
+   echo "should be: $nmy, we have: $ndicts" >&2

diff --git a/app-text/sdcv/files/sdcv-synonyms-bin-search.patch 
b/app-text/sdcv/files/sdcv-synonyms-bin-search.patch
new file mode 100644
index 000..e3583b1a5fb
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-synonyms-bin-search.patch
@@ -0,0 +1,112 @@
+ommit 4ae420734990ab9f5ccc038262368256b9323f4a
+Merge: b66799f 994c1c7
+Author: Evgeniy Dushistov 
+Date:   Wed Dec 23 04:30:13 2020 +0300
+
+Merge pull request #67 from doozan/master
+
+Use binary search for synonyms, fixes #31
+
+diff --git a/src/stardict_lib.cpp b/src/stardict_lib.cpp
+index 0af4304..6b1f92b 100644
+--- a/src/stardict_lib.cpp
 b/src/stardict_lib.cpp
+@@ -833,21 +833,23 @@ bool SynFile::load(const std::string , gulong wc)
+ {
+ struct stat stat_buf;
+ if (!stat(url.c_str(), _buf)) {
+-MapFile syn;
+-if (!syn.open(url.c_str(), stat_buf.st_size))
++
++if (!synfile.open(url.c_str(), stat_buf.st_size))
+ return false;
+-const gchar *current = syn.begin();
++
++synlist.resize(wc + 1);
++gchar *p1 = synfile.begin();
++
+ for (unsigned long i = 0; i < wc; i++) {
+ // each entry in a syn-file is:
+ // - 0-terminated string
+ // 4-byte index into .dict file in network byte order
+-glib::CharStr lower_string{ g_utf8_casefold(current, -1) };
+-std::string synonym{ get_impl(lower_string) };
+-current += synonym.length() + 1;
+-const guint32 idx = g_ntohl(get_uint32(current));
+-current += sizeof(idx);
+-synonyms[synonym] = idx;
++
++synlist[i] = p1;
++p1 += strlen(p1) + 1 + 4;
+ }
++synlist[wc] = p1;
++
+ return true;
+ } else {
+ return false;
+@@ -856,13 +858,38 @@ bool SynFile::load(const std::string , gulong wc)
+ 
+ bool SynFile::lookup(const char *str, glong )
+ {
+-glib::CharStr lower_string{ g_utf8_casefold(str, -1) };
+-auto it = synonyms.find(get_impl(lower_string));
+-if (it != synonyms.end()) {
+-idx = it->second;
+-return true;
++bool bFound = false;
++glong iTo = synlist.size() - 2;
++if (iTo <0) return false;
++
++if (stardict_strcmp(str, get_key(0)) < 0) {
++idx = 0;
++} else if (stardict_strcmp(str, get_key(iTo)) > 0) {
++idx = INVALID_INDEX;
++} else {
++glong iThisIndex = 0;
++glong iFrom = 0;
++gint cmpint;

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2019-06-05 Thread Andrew Savchenko 
commit: 9a397edb8301626407cf5f6b48383a79937a7fd8
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Jun  5 11:39:38 2019 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed Jun  5 11:45:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a397edb

app-text/sdcv: remove old

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/sdcv/Manifest   |  1 -
 app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild | 65 
 2 files changed, 66 deletions(-)

diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index 06470ecce51..c30f650ef31 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,2 +1 @@
-DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 BLAKE2B 
f2cca4dea35df82015607c88b225da593780d027978f5cd9c03d6f31b03d7ca134e0f2be3bd7ad6c4ed71f7c4ce8fab1bdd546914867b247e6c814ca669e7da5
 SHA512 
e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570
 DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 
3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00
 SHA512 
8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb

diff --git a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild 
b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
deleted file mode 100644
index f521e22ff60..000
--- a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs fr ru sk uk zh_CN zh_TW"
-: ${CMAKE_MAKEFILE_GENERATOR:="ninja"}
-
-inherit cmake-utils l10n
-
-DESCRIPTION="Console version of Stardict program"
-HOMEPAGE="http://sdcv.sourceforge.net;
-MY_PV="${PV/_beta/-beta}-Source"
-MY_PF="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_PF}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="darkterm nls"
-
-RDEPEND="sys-libs/zlib
-   sys-libs/readline:=
-   >=dev-libs/glib-2.6.1"
-DEPEND="${RDEPEND}
-   nls? ( >=sys-devel/gettext-0.14.1 )"
-
-src_prepare() {
-   if use darkterm; then
-   sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
-   fi
-
-   rm_loc() {
-   rm "po/${1}.po" || die
-   }
-   l10n_for_each_disabled_locale_do rm_loc
-
-   # do not install locale-specific man pages unless asked to
-   if ! has uk ${LINGUAS-uk}; then
-   sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
-   fi
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_NLS="$(usex nls)"
-   )
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-   use nls && cmake-utils_src_compile lang
-}
-
-src_install() {
-   # with USE=nls, but empty intersection of LINGUAS and list of
-   # supported translations, this directory is required, see bug 583386
-   # failure is ok here (e.g. if dir exists)
-   mkdir "${BUILD_DIR}/locale"
-   cmake-utils_src_install
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2019-05-23 Thread Mikle Kolyada 
commit: 634d566ac99188dadf93780c1d157cfc7c26e822
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu May 23 12:39:43 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu May 23 12:39:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=634d566a

app-text/sdcv: amd64 stable wrt bug #685122

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 app-text/sdcv/sdcv-0.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sdcv/sdcv-0.5.2.ebuild b/app-text/sdcv/sdcv-0.5.2.ebuild
index d408750a82c..59a8f62a0b1 100644
--- a/app-text/sdcv/sdcv-0.5.2.ebuild
+++ b/app-text/sdcv/sdcv-0.5.2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="darkterm nls readline test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2019-05-19 Thread Thomas Deutschmann 
commit: 40ec7d4b0c393aa14e719dc01d222f7e54791902
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun May 19 13:09:15 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun May 19 13:09:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ec7d4b

app-text/sdcv: x86 stable (bug #685122)

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 app-text/sdcv/sdcv-0.5.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/sdcv/sdcv-0.5.2.ebuild b/app-text/sdcv/sdcv-0.5.2.ebuild
index 722ad64a802..d408750a82c 100644
--- a/app-text/sdcv/sdcv-0.5.2.ebuild
+++ b/app-text/sdcv/sdcv-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="darkterm nls readline test"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2018-09-01 Thread Andrew Savchenko 
commit: 0c0c7751e431a7badc703c722264dda9443df186
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Sep  2 04:31:33 2018 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun Sep  2 04:33:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c0c7751

app-text/sdcv: update remote-id tag

Signed-off-by: Andrew Savchenko  gentoo.org>
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 app-text/sdcv/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sdcv/metadata.xml b/app-text/sdcv/metadata.xml
index ef1706e494f..0b6f03db029 100644
--- a/app-text/sdcv/metadata.xml
+++ b/app-text/sdcv/metadata.xml
@@ -11,6 +11,6 @@
dark background.


-   sdcv
+   Dushistov/sdcv

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/, app-text/sdcv/files/

2018-08-26 Thread Andrew Savchenko 
commit: e216cd8652873446227e4bffac6f6bb038afad92
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Aug 26 12:45:38 2018 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun Aug 26 12:46:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e216cd86

app-text/sdcv: version bump

- Readline support is now optional.
- Tests are available.

Signed-off-by: Andrew Savchenko  gentoo.org>
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 app-text/sdcv/Manifest   |  1 +
 app-text/sdcv/files/sdcv-t_interactive.patch | 11 +
 app-text/sdcv/files/sdcv-t_list.patch| 17 +++
 app-text/sdcv/sdcv-0.5.2.ebuild  | 73 
 4 files changed, 102 insertions(+)

diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index 3fd8aad357f..06470ecce51 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1 +1,2 @@
 DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 BLAKE2B 
f2cca4dea35df82015607c88b225da593780d027978f5cd9c03d6f31b03d7ca134e0f2be3bd7ad6c4ed71f7c4ce8fab1bdd546914867b247e6c814ca669e7da5
 SHA512 
e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570
+DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 
3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00
 SHA512 
8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb

diff --git a/app-text/sdcv/files/sdcv-t_interactive.patch 
b/app-text/sdcv/files/sdcv-t_interactive.patch
new file mode 100644
index 000..83d503136c0
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-t_interactive.patch
@@ -0,0 +1,11 @@
+--- sdcv-0.5.2/tests/t_interactive.orig2018-08-26 15:04:39.174389830 
+0300
 sdcv-0.5.2/tests/t_interactive 2018-08-26 15:05:01.494995830 +0300
+@@ -10,7 +10,7 @@
+ 
+ "$PATH_TO_SDCV" -n >/dev/null 2>&1 &
+ PID=$!
+-sleep 1
++sleep 5
+ 
+ if kill -0 $PID >/dev/null 2>&1 ; then
+   echo "process wait input: $PID, test failed" >&2

diff --git a/app-text/sdcv/files/sdcv-t_list.patch 
b/app-text/sdcv/files/sdcv-t_list.patch
new file mode 100644
index 000..8bd23892fc7
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-t_list.patch
@@ -0,0 +1,17 @@
+--- sdcv-0.5.2/tests/t_list.orig   2017-08-16 10:14:23.0 +0300
 sdcv-0.5.2/tests/t_list2018-08-26 15:12:31.501052398 +0300
+@@ -1,11 +1,10 @@
+ #!/bin/sh
+ 
+ PATH_TO_SDCV="$1"
+-ndicts=`"$PATH_TO_SDCV" -l | wc -l`
++TEST_DIR="$2"
++ndicts=`"$PATH_TO_SDCV" --data-dir "${TEST_DIR}" -l | wc -l`
+ ndicts=$(($ndicts-1))
+-ncom=`find /usr/share/stardict/dic -name "*.ifo" | wc -l`
+-nspe=`find "${HOME}"/.stardict/dic -name "*.ifo" | wc -l`
+-nmy=$(($ncom+$nspe))
++nmy=`find "${TEST_DIR}" -name "*.ifo" | wc -l`
+ 
+ if [ $nmy -ne $ndicts ]; then
+   echo "should be: $nmy, we have: $ndicts" >&2

diff --git a/app-text/sdcv/sdcv-0.5.2.ebuild b/app-text/sdcv/sdcv-0.5.2.ebuild
new file mode 100644
index 000..722ad64a802
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs fr ru sk uk zh_CN zh_TW"
+: ${CMAKE_MAKEFILE_GENERATOR:="ninja"}
+
+inherit cmake-utils l10n
+
+DESCRIPTION="Console version of Stardict program"
+HOMEPAGE="https://dushistov.github.io/sdcv/;
+SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="darkterm nls readline test"
+
+RDEPEND="
+   >=dev-libs/glib-2.6.1
+   sys-libs/zlib
+   readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}
+   nls? ( >=sys-devel/gettext-0.14.1 )
+   test? ( app-misc/jq )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-t_list.patch"
+   "${FILESDIR}/${PN}-t_interactive.patch"
+)
+
+src_prepare() {
+   if use darkterm; then
+   sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
+   fi
+
+   rm_loc() {
+   rm "po/${1}.po" || die
+   }
+   l10n_for_each_disabled_locale_do rm_loc
+
+   # do not install locale-specific man pages unless asked to
+   if ! has uk ${LINGUAS-uk}; then
+   sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
+   fi
+
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_NLS="$(usex nls)"
+   -DWITH_READLINE="$(usex readline)"
+   -DBUILD_TESTS="$(usex test ON OFF)"
+   )
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   cmake-utils_src_compile
+   use nls && cmake-utils_src_compile lang
+}
+
+src_install() {
+   # with USE=nls, but empty intersection of LINGUAS and list of
+   # supported translations, this directory is required, see bug 583386
+

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2018-06-07 Thread Andreas Sturmlechner 
commit: 84c21818e857f6127a8edd8769d3f07e2c9b2502
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  7 10:36:02 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  7 10:48:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c21818

app-text/sdcv: Drop 0.5.0_beta2 (r0)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-text/sdcv/sdcv-0.5.0_beta2.ebuild | 41 ---
 1 file changed, 41 deletions(-)

diff --git a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild 
b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
deleted file mode 100644
index 84bd106223f..000
--- a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Console version of Stardict program"
-HOMEPAGE="http://sdcv.sourceforge.net;
-MY_PV="${PV/_beta/-beta}-Source"
-MY_PF="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_PF}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="sys-libs/zlib
-   sys-libs/readline:=
-   >=dev-libs/glib-2.6.1"
-DEPEND="${RDEPEND}
-   nls? ( >=sys-devel/gettext-0.14.1 )"
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with nls)
-   )
-   cmake-utils_src_configure
-}
-
-src_compile() {
-   cmake-utils_src_compile
-   cmake-utils_src_compile lang
-}
-
-src_install() {
-   cmake-utils_src_install
-   dodoc AUTHORS NEWS
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2018-06-07 Thread Agostino Sarubbo 
commit: ebb9db10bcf42cffc091fc6197d46b0b18364629
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun  7 10:09:41 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun  7 10:09:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb9db10

app-text/sdcv: amd64 stable wrt bug #657248

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="amd64"

 app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild 
b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
index 3f716642b1d..f521e22ff60 100644
--- a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
+++ b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="darkterm nls"
 
 RDEPEND="sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2018-06-06 Thread Thomas Deutschmann 
commit: 992e739f21371c6c0cec60f850758b5c82eeb32f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Jun  6 23:03:54 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Jun  6 23:22:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=992e739f

app-text/sdcv: x86 stable (bug #657248)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild 
b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
index 7eeabd07deb..3f716642b1d 100644
--- a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
+++ b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="darkterm nls"
 
 RDEPEND="sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2018-01-05 Thread Ulrich Müller 
commit: bf2824e07eea04e4249e2c76a85511c55bc0d199
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Jan  5 19:02:19 2018 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Jan  5 19:21:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf2824e0

app-text/sdcv: Test LINGUAS rather than linguas_* USE flags.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild 
b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
index 77ff9d69add..7eeabd07deb 100644
--- a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
+++ b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,7 @@ src_prepare() {
l10n_for_each_disabled_locale_do rm_loc
 
# do not install locale-specific man pages unless asked to
-   if ! use linguas_uk; then
+   if ! has uk ${LINGUAS-uk}; then
sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
fi

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/, app-text/sdcv/files/

2016-06-26 Thread Andrew Savchenko 
commit: a8c1783461969de640a2a84a1a97425b68e4a927
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sun Jun 26 09:48:08 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sun Jun 26 09:50:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8c17834

app-text/sdcv: remove old

Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/sdcv/Manifest |  1 -
 app-text/sdcv/files/sdcv-0.4.2-crash.patch | 27 -
 app-text/sdcv/files/sdcv-0.4.2-dash.patch  | 21 --
 app-text/sdcv/files/sdcv-0.4.2-g-handling.patch| 21 --
 .../sdcv/files/sdcv-0.4.2-missing-headers.patch| 47 --
 app-text/sdcv/files/sdcv-0.4.2-respect-HOME.patch  | 17 
 app-text/sdcv/sdcv-0.4.2.ebuild| 47 --
 7 files changed, 181 deletions(-)

diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index 88c46f6..1cadede 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,2 +1 @@
-DIST sdcv-0.4.2.tar.bz2 181384 SHA256 
a164f079e93986814ea2d39f3a49cf9d1b71b01aad908254457fe3d0ded9deb2 SHA512 
0c701a64893c7531006617e190924e292bd755c2a4c3905fa7ab44002bf189b5d2c7694f331356093a3b5e9f690f89e50bca29b9c36a9fb9733603d2aef1b58b
 WHIRLPOOL 
e605ee39a38e405ddae1b438a6714b5f9bc684097fe264f4bd124955a2f05c39e4c3140fb22526ca5dee51f61803740321d6c4143212b6450c17bf507e869a6c
 DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 SHA256 
386cfc96285a653c697f8baeab676cb3f1645cea029464d194872d0bbae14ffb SHA512 
e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570
 WHIRLPOOL 
0e9cb7eaf6ccee6f9c7dbebbfee4d4a80c1cdca7444f2ba6f276a670924395dcdabd4ee7efe929bd940f3b3accc01e425f0270c2d7c897bcbd4adc03fd566a05

diff --git a/app-text/sdcv/files/sdcv-0.4.2-crash.patch 
b/app-text/sdcv/files/sdcv-0.4.2-crash.patch
deleted file mode 100644
index 264cffc..000
--- a/app-text/sdcv/files/sdcv-0.4.2-crash.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix unalligned access to buffer.
-
-On several architectures (arm, armel, sparc and ia64), unalligned access to
-integers is not allowed. Buffer in this function is not alligned at all and
-attempt to read integer from it causes crash of application on such
-architectures.
-
-Reported upstream at:
-https://sourceforge.net/tracker/index.php?func=detail=2149388_id=122858=694730
 a/src/lib/lib.cpp
-+++ b/src/lib/lib.cpp
-@@ -496,9 +496,13 @@
-   entries[i].keystr=p;
-   len=strlen(p);
-   p+=len+1;
--  entries[i].off=g_ntohl(*reinterpret_cast(p));
-+/*
-+ * Can not use typecasting here, because *data does not have
-+ * to be alligned and unalligned access fails on some architectures.
-+ */
-+  entries[i].off=((unsigned char)p[0] << 24) | ((unsigned 
char)p[1] << 16) | ((unsigned char)p[2] << 8) | (unsigned char)p[3];
-   p+=sizeof(guint32);
--  entries[i].size=g_ntohl(*reinterpret_cast(p));
-+  entries[i].size=((unsigned char)p[0] << 24) | ((unsigned 
char)p[1] << 16) | ((unsigned char)p[2] << 8) | (unsigned char)p[3];
-   p+=sizeof(guint32);
-   }
- }

diff --git a/app-text/sdcv/files/sdcv-0.4.2-dash.patch 
b/app-text/sdcv/files/sdcv-0.4.2-dash.patch
deleted file mode 100644
index 35d15ae..000
--- a/app-text/sdcv/files/sdcv-0.4.2-dash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/t_datadir b/tests/t_datadir
-index 116ae7e..327e5b5 100755
 a/tests/t_datadir
-+++ b/tests/t_datadir
-@@ -1 +1 @@
--#!/bin/sh
-+#!/bin/bash
-diff --git a/tests/t_list b/tests/t_list
-index 42ae137..62e52fd 100755
 a/tests/t_list
-+++ b/tests/t_list
-@@ -1 +1 @@
--#!/bin/sh
-+#!/bin/bash
-diff --git a/tests/t_utf8input b/tests/t_utf8input
-index 7ae88c4..e692ab0 100755
 a/tests/t_utf8input
-+++ b/tests/t_utf8input
-@@ -1 +1 @@
--#!/bin/sh
-+#!/bin/bash

diff --git a/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch 
b/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch
deleted file mode 100644
index 72fb690..000
--- a/app-text/sdcv/files/sdcv-0.4.2-g-handling.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://sourceforge.net/tracker/index.php?func=detail=2125962_id=122858=694730
-
-Fixes displaying of 'g' (gtk markup) entries.
 a/src/libwrapper.cpp
-+++ b/src/libwrapper.cpp
-@@ -118,7 +118,6 @@
-   switch (*p++) {
-   case 'm':
-   case 'l': //need more work...
--  case 'g':
-   sec_size = strlen(p);
-   if (sec_size) {
-   res+="\n";
-@@ -128,6 +127,7 @@
-   }
-   sec_size++;
-   break;
-+  case 'g':
-   case 'x':
-   sec_size = strlen(p);
-   if (sec_size) {

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2016-05-18 Thread Andrew Savchenko 
commit: 012c170099daadbb84ff4bdbf48be33398ace0a6
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 18 09:20:36 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed May 18 09:20:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=012c1700

app-text/sdcv: fix bug 583386

1. When USE="nls", but intersection of LINGUAS with PLOCALES is
zero, $BUILD_DIR/locale is not created, thus cmake generated build
fails install phase. Fixed by always creating this directory.

2. Remove dodoc useless in EAPI=6: we have only default doc files.

Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild 
b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
index 21fea92..ef684bb 100644
--- a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
+++ b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
@@ -58,6 +58,9 @@ src_compile() {
 }
 
 src_install() {
+   # with USE=nls, but empty intersection of LINGUAS and list of
+   # supported translations, this directory is required, see bug 583386
+   # failure is ok here (e.g. if dir exists)
+   mkdir "${BUILD_DIR}/locale"
cmake-utils_src_install
-   dodoc AUTHORS NEWS
 }

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2016-05-17 Thread Andrew Savchenko 
commit: 12510826f989bec90c5ffa54e6144b086f1eaebe
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Tue May 17 18:22:53 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Tue May 17 18:30:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12510826

app-text/sdcv: improve ebuild

- improve readability on dark terminals;
- port to EAPI 6;
- respect LINGUAS (for gettext localisation and man pages).

Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/sdcv/metadata.xml   |  4 ++
 app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild | 63 
 2 files changed, 67 insertions(+)

diff --git a/app-text/sdcv/metadata.xml b/app-text/sdcv/metadata.xml
index d82ae6e..ef1706e 100644
--- a/app-text/sdcv/metadata.xml
+++ b/app-text/sdcv/metadata.xml
@@ -6,6 +6,10 @@
Andrew Savchenko

sdcv - console version of StarDict 
program.
+   
+   Improve readability of color output on 
terminals with
+   dark background.
+   

sdcv


diff --git a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild 
b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
new file mode 100644
index 000..21fea92
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="cs fr ru sk uk zh_CN zh_TW"
+: ${CMAKE_MAKEFILE_GENERATOR:="ninja"}
+
+inherit cmake-utils l10n
+
+DESCRIPTION="Console version of Stardict program"
+HOMEPAGE="http://sdcv.sourceforge.net;
+MY_PV="${PV/_beta/-beta}-Source"
+MY_PF="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_PF}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="darkterm nls"
+
+RDEPEND="sys-libs/zlib
+   sys-libs/readline:=
+   >=dev-libs/glib-2.6.1"
+DEPEND="${RDEPEND}
+   nls? ( >=sys-devel/gettext-0.14.1 )"
+
+src_prepare() {
+   if use darkterm; then
+   sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
+   fi
+
+   rm_loc() {
+   rm "po/${1}.po" || die
+   }
+   l10n_for_each_disabled_locale_do rm_loc
+
+   # do not install locale-specific man pages unless asked to
+   if ! use linguas_uk; then
+   sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
+   fi
+
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_NLS="$(usex nls)"
+   )
+   cmake-utils_src_configure
+}
+
+src_compile() {
+   cmake-utils_src_compile
+   use nls && cmake-utils_src_compile lang
+}
+
+src_install() {
+   cmake-utils_src_install
+   dodoc AUTHORS NEWS
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2016-05-13 Thread Agostino Sarubbo 
commit: 4792750281013df3165b4ae63447ef195c1a227c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 13 08:39:04 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 13 08:41:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47927502

app-text/sdcv: amd64 stable wrt bug #582746

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-text/sdcv/sdcv-0.5.0_beta2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild 
b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
index 75f8e2f..acf402f 100644
--- a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
+++ b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="sys-libs/zlib

[gentoo-commits] repo/gentoo:master commit in: app-text/sdcv/

2016-05-11 Thread Andrew Savchenko 
commit: 92bd5af3cdb6937441f17d3c0521b101210c1e9d
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed May 11 10:46:44 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed May 11 10:46:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92bd5af3

app-text/sdcv: take an orphaned package

Such wonderful tool should have a maintainer :)

Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko  gentoo.org>

 app-text/sdcv/metadata.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-text/sdcv/metadata.xml b/app-text/sdcv/metadata.xml
index 6700636..d82ae6e 100644
--- a/app-text/sdcv/metadata.xml
+++ b/app-text/sdcv/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   birc...@gentoo.org
+   Andrew Savchenko
+   
sdcv - console version of StarDict 
program.

sdcv