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

2024-01-20 Thread Sam James
commit: 77a62609be37dc9b7231ef1b0b7a9952025d4db2
Author: Guillermo Joandet  gmail  com>
AuthorDate: Mon Dec 18 23:59:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 11:54:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77a62609

app-text/cherrytree: Version bump to 1.0.4

Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34358
Signed-off-by: Sam James  gentoo.org>

 app-text/cherrytree/Manifest|  1 +
 app-text/cherrytree/cherrytree-1.0.4.ebuild | 74 +
 2 files changed, 75 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 747956773495..761642d944ca 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,3 +1,4 @@
 DIST cherrytree_1.0.0.tar.xz 3746968 BLAKE2B 
0f13dc25f04bc04db7d1e35de8b2f0dce45f1edcbb32705171edd19f3f508c188182036313267fb0289e98fdd64ea7fbd673f33a494997d5a873dfbe63006b0c
 SHA512 
aa1e32be1cb99b11e158bb4d6a079a967f1b01109df76bc416cb1a11bf3628279dbf5a8ac9d476a2a9f2446f8e77d83a453891df8ea6b94ec97c3ea9b4294508
 DIST cherrytree_1.0.1.tar.xz 3682988 BLAKE2B 
59bb5fca46c090bfa219a0a90c4a2db6307d38844ecbe8e153159b8c39bc8e3d52b6d07b48fa10a481839666134fd74c195ad03c87c8b8698b7ebfbf83a405d5
 SHA512 
07d334b1af40b0195e600e676a45d9d72d1c13c8cedee6b7e576abecff0898ea248708a4f3795a9c3030e716ad814009013fd98cffe616c25a118b2b564528d1
 DIST cherrytree_1.0.2.tar.xz 3732232 BLAKE2B 
07fd346909ff501b88dac939e73f1eb5d30559c7a00ea1bf55ee47a0d87178434f05324509e8d8f00cec9d2188d3089baf1ff6f069eecb9c9f8ac14bddbe0c2b
 SHA512 
917ec9a0b4160328fe281139f95ac119f211a8d5f7bb4b7e6b3fb63d9fb0bc0eedbe6286ccf8627ce718dfeff8d9f9996ffda288ce16f8d8b18a0e64a98fd5bc
+DIST cherrytree_1.0.4.tar.xz 3436940 BLAKE2B 
67fec738e05f1823b9206d9a58f85be94df9c54d94e15a7408ade4801065523707e973bb0643d4b1c0ddb6c94a2a9eb00530b5c8cbd291696daa98f2d18f6767
 SHA512 
615c551523ef3cc7edab632c3e0d4fa4ca1feca719a15e5b3e47f38113c1033ed13ef4a2821b14a3b4ef3a4079bce7f8f2c5643d11a4ecd6cbdc49b408e5

diff --git a/app-text/cherrytree/cherrytree-1.0.4.ebuild 
b/app-text/cherrytree/cherrytree-1.0.4.ebuild
new file mode 100644
index ..dd062ad78a2f
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-1.0.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/;
+
+SRC_URI="https://github.com/giuspen/${PN}/releases/download/v$PV/${P/-/_}.tar.xz;
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm:1.4
+   dev-db/sqlite:3
+   dev-libs/fribidi
+   dev-libs/glib:2
+   dev-libs/libfmt:=
+   dev-libs/libxml2:2
+   dev-libs/spdlog:=
+   >=x11-libs/vte-0.70.2:2.91
+   net-misc/curl
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango"
+
+DEPEND="${PYTHON_DEPS}
+   ${RDEPEND}"
+
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( dev-util/cpputest )"
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   # python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   -DUSE_SHARED_FMT_SPDLOG=ON
+   )
+
+   cmake_src_configure
+}



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

2023-10-08 Thread Pacho Ramos
commit: 32d1d515b873119e859211bbdf3bd9d662d29af8
Author: Guillermo Joandet  gmail  com>
AuthorDate: Tue Sep 26 23:38:45 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct  8 11:51:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d1d515

app-text/cherrytree: Remove old versions

Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33082
Signed-off-by: Pacho Ramos  gentoo.org>

 app-text/cherrytree/Manifest  |  3 --
 app-text/cherrytree/cherrytree-0.99.53.ebuild | 74 ---
 app-text/cherrytree/cherrytree-0.99.54.ebuild | 74 ---
 app-text/cherrytree/cherrytree-0.99.55.ebuild | 74 ---
 4 files changed, 225 deletions(-)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 1ed42e73c50e..747956773495 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,6 +1,3 @@
-DIST cherrytree_0.99.53.tar.xz 3465176 BLAKE2B 
b7af2ba4fb4be5aaba66eca55436c889bfc80fad7f6bdbfcf7fbfd2ecb05b6a0143d1c8599836d4c1a8dde3bfa235335cbebc05164ac03bca1de13b613bcbca0
 SHA512 
e6fdc9ae0c5638944c1a9c7d6f9cbd902c59b0823422010815e78c93133504546142211ca34456b18cadf5a25c093385927fe7f24adceb7f5997f42a957e8666
-DIST cherrytree_0.99.54.tar.xz 3500772 BLAKE2B 
bec969f75629da0488774a4ca18abd32bf6db50d4ad66418726cdfd7894901401d7d5af21678fb0886863154aea68286e25d4bbfb21f16a616ab0aa89d44da4b
 SHA512 
c4e8ff4440fc688ee6b24279857452e00f85614dcf094b311a768479fcc842712171e4dcd0b121b865aedd2d854ed5906e7fc615a69a76d50af71b91bb29835e
-DIST cherrytree_0.99.55.tar.xz 2449336 BLAKE2B 
6e034b019a70849af99766085bc2c2e777e909a8d18f9b98943c6aeb1a0285573e3651cef1a2620f0eb9aad37d9f28cd871fbcff6f57e39bc89cd60ba4191028
 SHA512 
3c22df32fe0a4449607862c87aac46f52047a37a6404c848ce9a1e5308f87de7c5ca47c8e4abb21d1ecbe53bb7fc714fa7e0de0302caabd18e6eb2137c3438b6
 DIST cherrytree_1.0.0.tar.xz 3746968 BLAKE2B 
0f13dc25f04bc04db7d1e35de8b2f0dce45f1edcbb32705171edd19f3f508c188182036313267fb0289e98fdd64ea7fbd673f33a494997d5a873dfbe63006b0c
 SHA512 
aa1e32be1cb99b11e158bb4d6a079a967f1b01109df76bc416cb1a11bf3628279dbf5a8ac9d476a2a9f2446f8e77d83a453891df8ea6b94ec97c3ea9b4294508
 DIST cherrytree_1.0.1.tar.xz 3682988 BLAKE2B 
59bb5fca46c090bfa219a0a90c4a2db6307d38844ecbe8e153159b8c39bc8e3d52b6d07b48fa10a481839666134fd74c195ad03c87c8b8698b7ebfbf83a405d5
 SHA512 
07d334b1af40b0195e600e676a45d9d72d1c13c8cedee6b7e576abecff0898ea248708a4f3795a9c3030e716ad814009013fd98cffe616c25a118b2b564528d1
 DIST cherrytree_1.0.2.tar.xz 3732232 BLAKE2B 
07fd346909ff501b88dac939e73f1eb5d30559c7a00ea1bf55ee47a0d87178434f05324509e8d8f00cec9d2188d3089baf1ff6f069eecb9c9f8ac14bddbe0c2b
 SHA512 
917ec9a0b4160328fe281139f95ac119f211a8d5f7bb4b7e6b3fb63d9fb0bc0eedbe6286ccf8627ce718dfeff8d9f9996ffda288ce16f8d8b18a0e64a98fd5bc

diff --git a/app-text/cherrytree/cherrytree-0.99.53.ebuild 
b/app-text/cherrytree/cherrytree-0.99.53.ebuild
deleted file mode 100644
index ae17b8db137a..
--- a/app-text/cherrytree/cherrytree-0.99.53.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-any-r1 xdg
-
-DESCRIPTION="A hierarchical note taking application (C++ version)"
-HOMEPAGE="https://www.giuspen.com/cherrytree/;
-
-SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz;
-S="${WORKDIR}"/${P/-/_}
-
-KEYWORDS="~amd64 ~x86"
-
-# GPL-3 — future/src/ct (CherryTree)
-# LGPL-2.1 — future/src/7za (7zip)
-# MIT — future/src/fmt (libfmt)
-LICENSE="GPL-3 LGPL-2.1 MIT"
-SLOT="0"
-IUSE="nls test"
-
-# Has deps that aren't available in ::gentoo repo
-RESTRICT="test"
-
-RDEPEND="app-i18n/uchardet
-   app-text/gspell:=
-   >=dev-cpp/glibmm-2.64.2:2
-   dev-cpp/gtkmm:3.0
-   dev-cpp/gtksourceviewmm:3.0
-   dev-cpp/libxmlpp:2.6
-   dev-cpp/pangomm:1.4
-   dev-db/sqlite:3
-   dev-libs/fribidi
-   dev-libs/glib:2
-   dev-libs/libfmt:=
-   dev-libs/libxml2:2
-   dev-libs/spdlog:=
-   gui-libs/vte:2.91-gtk4
-   net-misc/curl
-   x11-libs/cairo
-   x11-libs/gtk+:3
-   x11-libs/pango"
-
-DEPEND="${PYTHON_DEPS}
-   ${RDEPEND}"
-
-BDEPEND="
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-   test? ( dev-util/cpputest )"
-
-src_prepare() {
-   # disable compress man pages
-   sed -i -e \
-   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
-   CMakeLists.txt || die
-
-   # python_fix_shebang .
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DPYTHON_EXEC="${PYTHON}"
-   -DUSE_NLS=$(usex nls)
-   -DBUILD_TESTING=$(usex test)
-   -DUSE_SHARED_FMT_SPDLOG=ON
-   )
-
-   

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

2023-10-08 Thread Pacho Ramos
commit: f804f50e59c7cc94a7517d8d5a5760d43e774ef8
Author: Guillermo Joandet  gmail  com>
AuthorDate: Tue Sep 26 23:37:22 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct  8 11:51:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f804f50e

app-text/cherrytree: Version bump to 1.0.2

Signed-off-by: Guillermo Joandet  gmail.com>
Signed-off-by: Pacho Ramos  gentoo.org>

 app-text/cherrytree/Manifest|  1 +
 app-text/cherrytree/cherrytree-1.0.2.ebuild | 74 +
 2 files changed, 75 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 4f47478b059d..1ed42e73c50e 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -3,3 +3,4 @@ DIST cherrytree_0.99.54.tar.xz 3500772 BLAKE2B 
bec969f75629da0488774a4ca18abd32b
 DIST cherrytree_0.99.55.tar.xz 2449336 BLAKE2B 
6e034b019a70849af99766085bc2c2e777e909a8d18f9b98943c6aeb1a0285573e3651cef1a2620f0eb9aad37d9f28cd871fbcff6f57e39bc89cd60ba4191028
 SHA512 
3c22df32fe0a4449607862c87aac46f52047a37a6404c848ce9a1e5308f87de7c5ca47c8e4abb21d1ecbe53bb7fc714fa7e0de0302caabd18e6eb2137c3438b6
 DIST cherrytree_1.0.0.tar.xz 3746968 BLAKE2B 
0f13dc25f04bc04db7d1e35de8b2f0dce45f1edcbb32705171edd19f3f508c188182036313267fb0289e98fdd64ea7fbd673f33a494997d5a873dfbe63006b0c
 SHA512 
aa1e32be1cb99b11e158bb4d6a079a967f1b01109df76bc416cb1a11bf3628279dbf5a8ac9d476a2a9f2446f8e77d83a453891df8ea6b94ec97c3ea9b4294508
 DIST cherrytree_1.0.1.tar.xz 3682988 BLAKE2B 
59bb5fca46c090bfa219a0a90c4a2db6307d38844ecbe8e153159b8c39bc8e3d52b6d07b48fa10a481839666134fd74c195ad03c87c8b8698b7ebfbf83a405d5
 SHA512 
07d334b1af40b0195e600e676a45d9d72d1c13c8cedee6b7e576abecff0898ea248708a4f3795a9c3030e716ad814009013fd98cffe616c25a118b2b564528d1
+DIST cherrytree_1.0.2.tar.xz 3732232 BLAKE2B 
07fd346909ff501b88dac939e73f1eb5d30559c7a00ea1bf55ee47a0d87178434f05324509e8d8f00cec9d2188d3089baf1ff6f069eecb9c9f8ac14bddbe0c2b
 SHA512 
917ec9a0b4160328fe281139f95ac119f211a8d5f7bb4b7e6b3fb63d9fb0bc0eedbe6286ccf8627ce718dfeff8d9f9996ffda288ce16f8d8b18a0e64a98fd5bc

diff --git a/app-text/cherrytree/cherrytree-1.0.2.ebuild 
b/app-text/cherrytree/cherrytree-1.0.2.ebuild
new file mode 100644
index ..dd062ad78a2f
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-1.0.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/;
+
+SRC_URI="https://github.com/giuspen/${PN}/releases/download/v$PV/${P/-/_}.tar.xz;
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm:1.4
+   dev-db/sqlite:3
+   dev-libs/fribidi
+   dev-libs/glib:2
+   dev-libs/libfmt:=
+   dev-libs/libxml2:2
+   dev-libs/spdlog:=
+   >=x11-libs/vte-0.70.2:2.91
+   net-misc/curl
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango"
+
+DEPEND="${PYTHON_DEPS}
+   ${RDEPEND}"
+
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( dev-util/cpputest )"
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   # python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   -DUSE_SHARED_FMT_SPDLOG=ON
+   )
+
+   cmake_src_configure
+}



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

2023-08-26 Thread Arthur Zamarin
commit: 1eff0c2e08cc0bede7fb0db2ad8cee53dbd27ba1
Author: Guillermo Joandet  gmail  com>
AuthorDate: Fri Aug 25 16:48:07 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Aug 26 17:19:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eff0c2e

app-text/cherrytree: Version bump to 1.0.1

Closes: https://bugs.gentoo.org/888717
Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32448
Signed-off-by: Arthur Zamarin  gentoo.org>

 app-text/cherrytree/Manifest|  1 +
 app-text/cherrytree/cherrytree-1.0.1.ebuild | 74 +
 2 files changed, 75 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index d9e97d539930..4f47478b059d 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -2,3 +2,4 @@ DIST cherrytree_0.99.53.tar.xz 3465176 BLAKE2B 
b7af2ba4fb4be5aaba66eca55436c889b
 DIST cherrytree_0.99.54.tar.xz 3500772 BLAKE2B 
bec969f75629da0488774a4ca18abd32bf6db50d4ad66418726cdfd7894901401d7d5af21678fb0886863154aea68286e25d4bbfb21f16a616ab0aa89d44da4b
 SHA512 
c4e8ff4440fc688ee6b24279857452e00f85614dcf094b311a768479fcc842712171e4dcd0b121b865aedd2d854ed5906e7fc615a69a76d50af71b91bb29835e
 DIST cherrytree_0.99.55.tar.xz 2449336 BLAKE2B 
6e034b019a70849af99766085bc2c2e777e909a8d18f9b98943c6aeb1a0285573e3651cef1a2620f0eb9aad37d9f28cd871fbcff6f57e39bc89cd60ba4191028
 SHA512 
3c22df32fe0a4449607862c87aac46f52047a37a6404c848ce9a1e5308f87de7c5ca47c8e4abb21d1ecbe53bb7fc714fa7e0de0302caabd18e6eb2137c3438b6
 DIST cherrytree_1.0.0.tar.xz 3746968 BLAKE2B 
0f13dc25f04bc04db7d1e35de8b2f0dce45f1edcbb32705171edd19f3f508c188182036313267fb0289e98fdd64ea7fbd673f33a494997d5a873dfbe63006b0c
 SHA512 
aa1e32be1cb99b11e158bb4d6a079a967f1b01109df76bc416cb1a11bf3628279dbf5a8ac9d476a2a9f2446f8e77d83a453891df8ea6b94ec97c3ea9b4294508
+DIST cherrytree_1.0.1.tar.xz 3682988 BLAKE2B 
59bb5fca46c090bfa219a0a90c4a2db6307d38844ecbe8e153159b8c39bc8e3d52b6d07b48fa10a481839666134fd74c195ad03c87c8b8698b7ebfbf83a405d5
 SHA512 
07d334b1af40b0195e600e676a45d9d72d1c13c8cedee6b7e576abecff0898ea248708a4f3795a9c3030e716ad814009013fd98cffe616c25a118b2b564528d1

diff --git a/app-text/cherrytree/cherrytree-1.0.1.ebuild 
b/app-text/cherrytree/cherrytree-1.0.1.ebuild
new file mode 100644
index ..837ea599e0fc
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-1.0.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/;
+
+SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz;
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm:1.4
+   dev-db/sqlite:3
+   dev-libs/fribidi
+   dev-libs/glib:2
+   dev-libs/libfmt:=
+   dev-libs/libxml2:2
+   dev-libs/spdlog:=
+   >=x11-libs/vte-0.70.2:2.91
+   net-misc/curl
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango"
+
+DEPEND="${PYTHON_DEPS}
+   ${RDEPEND}"
+
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( dev-util/cpputest )"
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   # python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   -DUSE_SHARED_FMT_SPDLOG=ON
+   )
+
+   cmake_src_configure
+}



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

2023-07-25 Thread Sam James
commit: c1c2ca3a8269b9e6d5943412766bf1deb83296f4
Author: Guillermo Joandet  gmail  com>
AuthorDate: Sun Jul 23 14:20:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 26 03:11:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c2ca3a

app-text/cherrytree: Version bump to 1.0.0

Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32013
Signed-off-by: Sam James  gentoo.org>

 app-text/cherrytree/Manifest|  1 +
 app-text/cherrytree/cherrytree-1.0.0.ebuild | 74 +
 2 files changed, 75 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index f48b6ef3db6d..d9e97d539930 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,3 +1,4 @@
 DIST cherrytree_0.99.53.tar.xz 3465176 BLAKE2B 
b7af2ba4fb4be5aaba66eca55436c889bfc80fad7f6bdbfcf7fbfd2ecb05b6a0143d1c8599836d4c1a8dde3bfa235335cbebc05164ac03bca1de13b613bcbca0
 SHA512 
e6fdc9ae0c5638944c1a9c7d6f9cbd902c59b0823422010815e78c93133504546142211ca34456b18cadf5a25c093385927fe7f24adceb7f5997f42a957e8666
 DIST cherrytree_0.99.54.tar.xz 3500772 BLAKE2B 
bec969f75629da0488774a4ca18abd32bf6db50d4ad66418726cdfd7894901401d7d5af21678fb0886863154aea68286e25d4bbfb21f16a616ab0aa89d44da4b
 SHA512 
c4e8ff4440fc688ee6b24279857452e00f85614dcf094b311a768479fcc842712171e4dcd0b121b865aedd2d854ed5906e7fc615a69a76d50af71b91bb29835e
 DIST cherrytree_0.99.55.tar.xz 2449336 BLAKE2B 
6e034b019a70849af99766085bc2c2e777e909a8d18f9b98943c6aeb1a0285573e3651cef1a2620f0eb9aad37d9f28cd871fbcff6f57e39bc89cd60ba4191028
 SHA512 
3c22df32fe0a4449607862c87aac46f52047a37a6404c848ce9a1e5308f87de7c5ca47c8e4abb21d1ecbe53bb7fc714fa7e0de0302caabd18e6eb2137c3438b6
+DIST cherrytree_1.0.0.tar.xz 3746968 BLAKE2B 
0f13dc25f04bc04db7d1e35de8b2f0dce45f1edcbb32705171edd19f3f508c188182036313267fb0289e98fdd64ea7fbd673f33a494997d5a873dfbe63006b0c
 SHA512 
aa1e32be1cb99b11e158bb4d6a079a967f1b01109df76bc416cb1a11bf3628279dbf5a8ac9d476a2a9f2446f8e77d83a453891df8ea6b94ec97c3ea9b4294508

diff --git a/app-text/cherrytree/cherrytree-1.0.0.ebuild 
b/app-text/cherrytree/cherrytree-1.0.0.ebuild
new file mode 100644
index ..a757d8026dc5
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-1.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/;
+
+SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz;
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm:1.4
+   dev-db/sqlite:3
+   dev-libs/fribidi
+   dev-libs/glib:2
+   dev-libs/libfmt:=
+   dev-libs/libxml2:2
+   dev-libs/spdlog:=
+   >=x11-libs/vte-0.70.2:2.91
+   net-misc/curl
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango"
+
+DEPEND="${PYTHON_DEPS}
+   ${RDEPEND}"
+
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( dev-util/cpputest )"
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   # python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   -DUSE_SHARED_FMT_SPDLOG=ON
+   )
+
+   cmake_src_configure
+}



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

2023-03-11 Thread Sam James
commit: ab9087e29facf1b41401b881f436e6f972332b18
Author: Guillermo Joandet  gmail  com>
AuthorDate: Sat Mar 11 21:13:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 21:22:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9087e2

app-text/cherrytree: Version bump to 0.99.55

Signed-off-by: Guillermo Joandet  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-text/cherrytree/Manifest  |  1 +
 app-text/cherrytree/cherrytree-0.99.55.ebuild | 74 +++
 2 files changed, 75 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 9aa0c4248a97..1882814e067e 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,3 +1,4 @@
 DIST cherrytree_0.99.51.tar.xz 4429456 BLAKE2B 
c4673e8c086882cb8be6b6d04cadb6353a82e3bb1c7062ab442992338154908a30a4cfd0b59101b7a88116846abcffaa213ddc37cd715df7eb133a333b881ae2
 SHA512 
98bcbfcb578970c9709f96926b0a9f5100ffe620453519e4292620fe9526c9134ac72f399703b045e4a433565d8a05e0f8fde126f48d458e7f9edb7b79ee34e6
 DIST cherrytree_0.99.53.tar.xz 3465176 BLAKE2B 
b7af2ba4fb4be5aaba66eca55436c889bfc80fad7f6bdbfcf7fbfd2ecb05b6a0143d1c8599836d4c1a8dde3bfa235335cbebc05164ac03bca1de13b613bcbca0
 SHA512 
e6fdc9ae0c5638944c1a9c7d6f9cbd902c59b0823422010815e78c93133504546142211ca34456b18cadf5a25c093385927fe7f24adceb7f5997f42a957e8666
 DIST cherrytree_0.99.54.tar.xz 3500772 BLAKE2B 
bec969f75629da0488774a4ca18abd32bf6db50d4ad66418726cdfd7894901401d7d5af21678fb0886863154aea68286e25d4bbfb21f16a616ab0aa89d44da4b
 SHA512 
c4e8ff4440fc688ee6b24279857452e00f85614dcf094b311a768479fcc842712171e4dcd0b121b865aedd2d854ed5906e7fc615a69a76d50af71b91bb29835e
+DIST cherrytree_0.99.55.tar.xz 2449336 BLAKE2B 
6e034b019a70849af99766085bc2c2e777e909a8d18f9b98943c6aeb1a0285573e3651cef1a2620f0eb9aad37d9f28cd871fbcff6f57e39bc89cd60ba4191028
 SHA512 
3c22df32fe0a4449607862c87aac46f52047a37a6404c848ce9a1e5308f87de7c5ca47c8e4abb21d1ecbe53bb7fc714fa7e0de0302caabd18e6eb2137c3438b6

diff --git a/app-text/cherrytree/cherrytree-0.99.55.ebuild 
b/app-text/cherrytree/cherrytree-0.99.55.ebuild
new file mode 100644
index ..589376ce484d
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.55.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/;
+
+SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz;
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm:1.4
+   dev-db/sqlite:3
+   dev-libs/fribidi
+   dev-libs/glib:2
+   dev-libs/libfmt:=
+   dev-libs/libxml2:2
+   dev-libs/spdlog:=
+   >=x11-libs/vte-0.70.2:2.91
+   net-misc/curl
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango"
+
+DEPEND="${PYTHON_DEPS}
+   ${RDEPEND}"
+
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( dev-util/cpputest )"
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   # python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   -DUSE_SHARED_FMT_SPDLOG=ON
+   )
+
+   cmake_src_configure
+}



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

2023-03-11 Thread Sam James
commit: 1b3b7fe83f101a6f09a5ea0137eea448c2c29c58
Author: Guillermo Joandet  gmail  com>
AuthorDate: Sat Mar 11 21:15:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 21:22:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3b7fe8

app-text/cherrytree: Drop old version 0.99.51-r1

Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30060
Signed-off-by: Sam James  gentoo.org>

 app-text/cherrytree/Manifest |  1 -
 app-text/cherrytree/cherrytree-0.99.51-r1.ebuild | 87 
 2 files changed, 88 deletions(-)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 1882814e067e..f48b6ef3db6d 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,4 +1,3 @@
-DIST cherrytree_0.99.51.tar.xz 4429456 BLAKE2B 
c4673e8c086882cb8be6b6d04cadb6353a82e3bb1c7062ab442992338154908a30a4cfd0b59101b7a88116846abcffaa213ddc37cd715df7eb133a333b881ae2
 SHA512 
98bcbfcb578970c9709f96926b0a9f5100ffe620453519e4292620fe9526c9134ac72f399703b045e4a433565d8a05e0f8fde126f48d458e7f9edb7b79ee34e6
 DIST cherrytree_0.99.53.tar.xz 3465176 BLAKE2B 
b7af2ba4fb4be5aaba66eca55436c889bfc80fad7f6bdbfcf7fbfd2ecb05b6a0143d1c8599836d4c1a8dde3bfa235335cbebc05164ac03bca1de13b613bcbca0
 SHA512 
e6fdc9ae0c5638944c1a9c7d6f9cbd902c59b0823422010815e78c93133504546142211ca34456b18cadf5a25c093385927fe7f24adceb7f5997f42a957e8666
 DIST cherrytree_0.99.54.tar.xz 3500772 BLAKE2B 
bec969f75629da0488774a4ca18abd32bf6db50d4ad66418726cdfd7894901401d7d5af21678fb0886863154aea68286e25d4bbfb21f16a616ab0aa89d44da4b
 SHA512 
c4e8ff4440fc688ee6b24279857452e00f85614dcf094b311a768479fcc842712171e4dcd0b121b865aedd2d854ed5906e7fc615a69a76d50af71b91bb29835e
 DIST cherrytree_0.99.55.tar.xz 2449336 BLAKE2B 
6e034b019a70849af99766085bc2c2e777e909a8d18f9b98943c6aeb1a0285573e3651cef1a2620f0eb9aad37d9f28cd871fbcff6f57e39bc89cd60ba4191028
 SHA512 
3c22df32fe0a4449607862c87aac46f52047a37a6404c848ce9a1e5308f87de7c5ca47c8e4abb21d1ecbe53bb7fc714fa7e0de0302caabd18e6eb2137c3438b6

diff --git a/app-text/cherrytree/cherrytree-0.99.51-r1.ebuild 
b/app-text/cherrytree/cherrytree-0.99.51-r1.ebuild
deleted file mode 100644
index 4394cb2365b5..
--- a/app-text/cherrytree/cherrytree-0.99.51-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-any-r1 xdg
-
-DESCRIPTION="A hierarchical note taking application (C++ version)"
-HOMEPAGE="https://www.giuspen.com/cherrytree/;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/giuspen/cherrytree;
-   S="${WORKDIR}/${P}/future"
-else
-   
SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz;
-   S="${WORKDIR}"/${P/-/_}
-
-   KEYWORDS="~amd64 ~x86"
-   # S="${WORKDIR}/${PN}-${COMMIT}/future"
-fi
-
-# GPL-3 — future/src/ct (CherryTree)
-# LGPL-2.1 — future/src/7za (7zip)
-# MIT — future/src/fmt (libfmt)
-LICENSE="GPL-3 LGPL-2.1 MIT"
-SLOT="0"
-IUSE="nls test"
-
-# Has deps that aren't available in ::gentoo repo
-RESTRICT="test"
-
-RDEPEND="app-i18n/uchardet
-   app-text/gspell:=
-   >=dev-cpp/glibmm-2.64.2:2
-   dev-cpp/gtkmm:3.0
-   dev-cpp/gtksourceviewmm:3.0
-   dev-cpp/libxmlpp:2.6
-   dev-cpp/pangomm:1.4
-   dev-db/sqlite:3
-   dev-libs/glib:2
-   dev-libs/libfmt:=
-   dev-libs/fribidi
-   dev-libs/spdlog:=
-   net-misc/curl
-   x11-libs/cairo
-   x11-libs/gtk+:3
-   x11-libs/pango
-   x11-libs/vte:2.91"
-DEPEND="${PYTHON_DEPS}
-${RDEPEND}
-"
-BDEPEND="
-   virtual/pkgconfig
-   nls? (
-   sys-devel/gettext
-   )
-   test? ( dev-util/cpputest )"
-
-src_prepare() {
-   # disable compress man pages
-   sed -i -e \
-   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
-   CMakeLists.txt || die
-
-   if [[ ${PV} != * ]]; then
-   sed -i \
-   -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
-   CMakeLists.txt || die
-   fi
-
-   # python_fix_shebang .
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DPYTHON_EXEC="${PYTHON}"
-   -DUSE_NLS=$(usex nls)
-   -DBUILD_TESTING=$(usex test)
-   -DUSE_SHARED_FMT_SPDLOG=ON
-   )
-
-   cmake_src_configure
-}



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

2023-03-11 Thread Sam James
commit: baf564f11eb3a3706edc8e47757b0d1a7a6ea3c8
Author: Guillermo Joandet  gmail  com>
AuthorDate: Tue Jan 31 14:54:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 17:04:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baf564f1

app-text/cherrytree: Version bump to 0.99.54

Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29355
Signed-off-by: Sam James  gentoo.org>

 app-text/cherrytree/Manifest  |  1 +
 app-text/cherrytree/cherrytree-0.99.54.ebuild | 74 +++
 2 files changed, 75 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 7b0f6d1c86d6..9aa0c4248a97 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,2 +1,3 @@
 DIST cherrytree_0.99.51.tar.xz 4429456 BLAKE2B 
c4673e8c086882cb8be6b6d04cadb6353a82e3bb1c7062ab442992338154908a30a4cfd0b59101b7a88116846abcffaa213ddc37cd715df7eb133a333b881ae2
 SHA512 
98bcbfcb578970c9709f96926b0a9f5100ffe620453519e4292620fe9526c9134ac72f399703b045e4a433565d8a05e0f8fde126f48d458e7f9edb7b79ee34e6
 DIST cherrytree_0.99.53.tar.xz 3465176 BLAKE2B 
b7af2ba4fb4be5aaba66eca55436c889bfc80fad7f6bdbfcf7fbfd2ecb05b6a0143d1c8599836d4c1a8dde3bfa235335cbebc05164ac03bca1de13b613bcbca0
 SHA512 
e6fdc9ae0c5638944c1a9c7d6f9cbd902c59b0823422010815e78c93133504546142211ca34456b18cadf5a25c093385927fe7f24adceb7f5997f42a957e8666
+DIST cherrytree_0.99.54.tar.xz 3500772 BLAKE2B 
bec969f75629da0488774a4ca18abd32bf6db50d4ad66418726cdfd7894901401d7d5af21678fb0886863154aea68286e25d4bbfb21f16a616ab0aa89d44da4b
 SHA512 
c4e8ff4440fc688ee6b24279857452e00f85614dcf094b311a768479fcc842712171e4dcd0b121b865aedd2d854ed5906e7fc615a69a76d50af71b91bb29835e

diff --git a/app-text/cherrytree/cherrytree-0.99.54.ebuild 
b/app-text/cherrytree/cherrytree-0.99.54.ebuild
new file mode 100644
index ..589376ce484d
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.54.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/;
+
+SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz;
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm:1.4
+   dev-db/sqlite:3
+   dev-libs/fribidi
+   dev-libs/glib:2
+   dev-libs/libfmt:=
+   dev-libs/libxml2:2
+   dev-libs/spdlog:=
+   >=x11-libs/vte-0.70.2:2.91
+   net-misc/curl
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango"
+
+DEPEND="${PYTHON_DEPS}
+   ${RDEPEND}"
+
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( dev-util/cpputest )"
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   # python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   -DUSE_SHARED_FMT_SPDLOG=ON
+   )
+
+   cmake_src_configure
+}



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

2022-12-21 Thread Sam James
commit: dd359318bfdeff0c34db15fc704c5b17b718ea0c
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 21 23:08:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 21 23:09:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd359318

app-text/cherrytree: add subslot dep on dev-libs/spdlog

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

 .../{cherrytree-0.99.51.ebuild => cherrytree-0.99.51-r1.ebuild} | 2 +-
 app-text/cherrytree/cherrytree-0.99.53.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/cherrytree/cherrytree-0.99.51.ebuild 
b/app-text/cherrytree/cherrytree-0.99.51-r1.ebuild
similarity index 98%
rename from app-text/cherrytree/cherrytree-0.99.51.ebuild
rename to app-text/cherrytree/cherrytree-0.99.51-r1.ebuild
index b9a3c9d99fa5..080371b262c0 100644
--- a/app-text/cherrytree/cherrytree-0.99.51.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.51-r1.ebuild
@@ -43,7 +43,7 @@ RDEPEND="app-i18n/uchardet
dev-libs/glib:2
dev-libs/libfmt:=
dev-libs/fribidi
-   dev-libs/spdlog
+   dev-libs/spdlog:=
net-misc/curl
x11-libs/cairo
x11-libs/gtk+:3

diff --git a/app-text/cherrytree/cherrytree-0.99.53.ebuild 
b/app-text/cherrytree/cherrytree-0.99.53.ebuild
index 49820446e2a1..0cb5ef709c01 100644
--- a/app-text/cherrytree/cherrytree-0.99.53.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.53.ebuild
@@ -37,7 +37,7 @@ RDEPEND="app-i18n/uchardet
dev-libs/glib:2
dev-libs/libfmt:=
dev-libs/libxml2:2
-   dev-libs/spdlog
+   dev-libs/spdlog:=
gui-libs/vte:2.91-gtk4
net-misc/curl
x11-libs/cairo



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

2022-12-21 Thread Sam James
commit: 166077f9dadc3fc7d79868d566b08c1ae1000c89
Author: Guillermo Joandet  gmail  com>
AuthorDate: Mon Nov 28 21:43:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 21 23:09:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=166077f9

app-text/cherrytree: Drop old versions 0.99.37, 0.99.47-r1, 0.99.48

Signed-off-by: Guillermo Joandet  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-text/cherrytree/Manifest |  4 +-
 app-text/cherrytree/cherrytree-0.99.37.ebuild| 90 ---
 app-text/cherrytree/cherrytree-0.99.47-r1.ebuild | 90 ---
 app-text/cherrytree/cherrytree-0.99.48.ebuild| 91 
 4 files changed, 1 insertion(+), 274 deletions(-)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index cef193200d5b..7b0f6d1c86d6 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,4 +1,2 @@
-DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 
42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60
 SHA512 
2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
-DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 
1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742
 SHA512 
2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023
-DIST cherrytree_0.99.48.tar.xz 3474468 BLAKE2B 
b60cc2ffa4f5bd6e91e2a8b34811ad6977d46bdd02c7c1b2bfcdbf4df6107753a2390bc6a15daae8d5268af017ff52d217ab79ed5b4d5d107ef736257999b865
 SHA512 
eb4690bbc5865b9a0c7d0cb11341fe5ac17f11d417ad765b29784083a83f18c06a39b5b738838e3d57754de25adf1861ea4a6ad472e01a895e8fce0af0964926
 DIST cherrytree_0.99.51.tar.xz 4429456 BLAKE2B 
c4673e8c086882cb8be6b6d04cadb6353a82e3bb1c7062ab442992338154908a30a4cfd0b59101b7a88116846abcffaa213ddc37cd715df7eb133a333b881ae2
 SHA512 
98bcbfcb578970c9709f96926b0a9f5100ffe620453519e4292620fe9526c9134ac72f399703b045e4a433565d8a05e0f8fde126f48d458e7f9edb7b79ee34e6
+DIST cherrytree_0.99.53.tar.xz 3465176 BLAKE2B 
b7af2ba4fb4be5aaba66eca55436c889bfc80fad7f6bdbfcf7fbfd2ecb05b6a0143d1c8599836d4c1a8dde3bfa235335cbebc05164ac03bca1de13b613bcbca0
 SHA512 
e6fdc9ae0c5638944c1a9c7d6f9cbd902c59b0823422010815e78c93133504546142211ca34456b18cadf5a25c093385927fe7f24adceb7f5997f42a957e8666

diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild 
b/app-text/cherrytree/cherrytree-0.99.37.ebuild
deleted file mode 100644
index 2534d1a2e1ca..
--- a/app-text/cherrytree/cherrytree-0.99.37.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake python-any-r1 xdg
-
-DESCRIPTION="A hierarchical note taking application (C++ version)"
-HOMEPAGE="https://www.giuspen.com/cherrytree 
https://github.com/giuspen/cherrytree;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/giuspen/cherrytree;
-   S="${WORKDIR}/${P}/future"
-else
-   
SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-#  S="${WORKDIR}/${PN}-${COMMIT}/future"
-fi
-
-# GPL-3 — future/src/ct (CherryTree)
-# LGPL-2.1 — future/src/7za (7zip)
-# MIT — future/src/fmt (libfmt)
-LICENSE="GPL-3 LGPL-2.1 MIT"
-SLOT="0"
-IUSE="nls test"
-
-# Has deps that aren't available in ::gentoo repo
-RESTRICT="test"
-
-RDEPEND="
-   app-i18n/uchardet
-   app-text/gspell:=
-   >=dev-cpp/glibmm-2.64.2:2
-   dev-cpp/gtkmm:3.0
-   dev-cpp/gtksourceviewmm:3.0
-   dev-cpp/libxmlpp:2.6
-   dev-cpp/pangomm:1.4
-   dev-db/sqlite:3
-   dev-libs/glib:2
-   dev-libs/libfmt
-   dev-libs/libxml2:2
-   dev-libs/spdlog
-   net-misc/curl
-   "
-DEPEND="${RDEPEND}
-   $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
-BDEPEND="${PYTHON_DEPS}
-   virtual/pkgconfig
-   nls? (
-   dev-util/intltool
-   sys-devel/gettext
-   )
-   test? ( dev-util/cpputest )"
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-   has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-   # disable compress man pages
-   sed -i -e \
-   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
-   CMakeLists.txt || die
-
-   if [[ ${PV} != * ]]; then
-   sed -i \
-   -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
-   CMakeLists.txt || die
-   fi
-
-#  python_fix_shebang .
-   cmake_src_prepare
-}
-

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

2022-12-21 Thread Sam James
commit: ec8082d8a9bd808d863f0f24863e8d1cc4c1a4ee
Author: Guillermo Joandet  gmail  com>
AuthorDate: Wed Dec 21 23:07:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 21 23:09:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec8082d8

app-text/cherrytree: add 0.99.53

Closes: https://github.com/gentoo/gentoo/pull/28469
Signed-off-by: Guillermo Joandet  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 app-text/cherrytree/cherrytree-0.99.53.ebuild | 74 +++
 1 file changed, 74 insertions(+)

diff --git a/app-text/cherrytree/cherrytree-0.99.53.ebuild 
b/app-text/cherrytree/cherrytree-0.99.53.ebuild
new file mode 100644
index ..49820446e2a1
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.53.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/;
+
+SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz;
+S="${WORKDIR}"/${P/-/_}
+
+KEYWORDS="~amd64 ~x86"
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm:1.4
+   dev-db/sqlite:3
+   dev-libs/fribidi
+   dev-libs/glib:2
+   dev-libs/libfmt:=
+   dev-libs/libxml2:2
+   dev-libs/spdlog
+   gui-libs/vte:2.91-gtk4
+   net-misc/curl
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango"
+
+DEPEND="${PYTHON_DEPS}
+   ${RDEPEND}"
+
+BDEPEND="
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( dev-util/cpputest )"
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   # python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   -DUSE_SHARED_FMT_SPDLOG=ON
+   )
+
+   cmake_src_configure
+}



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

2022-12-19 Thread Andreas Sturmlechner
commit: 301449e073fe6c03a0a28600d0bd013dc4597219
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 19 14:48:27 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 19 14:49:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=301449e0

app-text/cherrytree: Revert "drop 0.99.37, 0.99.47-r1"

This reverts commit ea608df912be0ce95f58413ace36701f51a51e2f.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-text/cherrytree/Manifest |  2 +
 app-text/cherrytree/cherrytree-0.99.37.ebuild| 90 
 app-text/cherrytree/cherrytree-0.99.47-r1.ebuild | 90 
 3 files changed, 182 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 6e9108422ad4..cef193200d5b 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,2 +1,4 @@
+DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 
42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60
 SHA512 
2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
+DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 
1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742
 SHA512 
2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023
 DIST cherrytree_0.99.48.tar.xz 3474468 BLAKE2B 
b60cc2ffa4f5bd6e91e2a8b34811ad6977d46bdd02c7c1b2bfcdbf4df6107753a2390bc6a15daae8d5268af017ff52d217ab79ed5b4d5d107ef736257999b865
 SHA512 
eb4690bbc5865b9a0c7d0cb11341fe5ac17f11d417ad765b29784083a83f18c06a39b5b738838e3d57754de25adf1861ea4a6ad472e01a895e8fce0af0964926
 DIST cherrytree_0.99.51.tar.xz 4429456 BLAKE2B 
c4673e8c086882cb8be6b6d04cadb6353a82e3bb1c7062ab442992338154908a30a4cfd0b59101b7a88116846abcffaa213ddc37cd715df7eb133a333b881ae2
 SHA512 
98bcbfcb578970c9709f96926b0a9f5100ffe620453519e4292620fe9526c9134ac72f399703b045e4a433565d8a05e0f8fde126f48d458e7f9edb7b79ee34e6

diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild 
b/app-text/cherrytree/cherrytree-0.99.37.ebuild
new file mode 100644
index ..2534d1a2e1ca
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.37.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree 
https://github.com/giuspen/cherrytree;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/giuspen/cherrytree;
+   S="${WORKDIR}/${P}/future"
+else
+   
SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+#  S="${WORKDIR}/${PN}-${COMMIT}/future"
+fi
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="
+   app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm:1.4
+   dev-db/sqlite:3
+   dev-libs/glib:2
+   dev-libs/libfmt
+   dev-libs/libxml2:2
+   dev-libs/spdlog
+   net-misc/curl
+   "
+DEPEND="${RDEPEND}
+   $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
+BDEPEND="${PYTHON_DEPS}
+   virtual/pkgconfig
+   nls? (
+   dev-util/intltool
+   sys-devel/gettext
+   )
+   test? ( dev-util/cpputest )"
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+   has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   if [[ ${PV} != * ]]; then
+   sed -i \
+   -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
+   CMakeLists.txt || die
+   fi
+
+#  python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   )
+
+   cmake_src_configure
+}

diff --git a/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild 
b/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
new file mode 100644
index ..7f173bed6432
--- 

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

2022-12-19 Thread Andreas Sturmlechner
commit: ea608df912be0ce95f58413ace36701f51a51e2f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 18 11:59:00 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 19 14:45:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea608df9

app-text/cherrytree: drop 0.99.37, 0.99.47-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-text/cherrytree/Manifest |  2 -
 app-text/cherrytree/cherrytree-0.99.37.ebuild| 90 
 app-text/cherrytree/cherrytree-0.99.47-r1.ebuild | 90 
 3 files changed, 182 deletions(-)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index cef193200d5b..6e9108422ad4 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,4 +1,2 @@
-DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 
42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60
 SHA512 
2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
-DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 
1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742
 SHA512 
2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023
 DIST cherrytree_0.99.48.tar.xz 3474468 BLAKE2B 
b60cc2ffa4f5bd6e91e2a8b34811ad6977d46bdd02c7c1b2bfcdbf4df6107753a2390bc6a15daae8d5268af017ff52d217ab79ed5b4d5d107ef736257999b865
 SHA512 
eb4690bbc5865b9a0c7d0cb11341fe5ac17f11d417ad765b29784083a83f18c06a39b5b738838e3d57754de25adf1861ea4a6ad472e01a895e8fce0af0964926
 DIST cherrytree_0.99.51.tar.xz 4429456 BLAKE2B 
c4673e8c086882cb8be6b6d04cadb6353a82e3bb1c7062ab442992338154908a30a4cfd0b59101b7a88116846abcffaa213ddc37cd715df7eb133a333b881ae2
 SHA512 
98bcbfcb578970c9709f96926b0a9f5100ffe620453519e4292620fe9526c9134ac72f399703b045e4a433565d8a05e0f8fde126f48d458e7f9edb7b79ee34e6

diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild 
b/app-text/cherrytree/cherrytree-0.99.37.ebuild
deleted file mode 100644
index 2534d1a2e1ca..
--- a/app-text/cherrytree/cherrytree-0.99.37.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit cmake python-any-r1 xdg
-
-DESCRIPTION="A hierarchical note taking application (C++ version)"
-HOMEPAGE="https://www.giuspen.com/cherrytree 
https://github.com/giuspen/cherrytree;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/giuspen/cherrytree;
-   S="${WORKDIR}/${P}/future"
-else
-   
SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-#  S="${WORKDIR}/${PN}-${COMMIT}/future"
-fi
-
-# GPL-3 — future/src/ct (CherryTree)
-# LGPL-2.1 — future/src/7za (7zip)
-# MIT — future/src/fmt (libfmt)
-LICENSE="GPL-3 LGPL-2.1 MIT"
-SLOT="0"
-IUSE="nls test"
-
-# Has deps that aren't available in ::gentoo repo
-RESTRICT="test"
-
-RDEPEND="
-   app-i18n/uchardet
-   app-text/gspell:=
-   >=dev-cpp/glibmm-2.64.2:2
-   dev-cpp/gtkmm:3.0
-   dev-cpp/gtksourceviewmm:3.0
-   dev-cpp/libxmlpp:2.6
-   dev-cpp/pangomm:1.4
-   dev-db/sqlite:3
-   dev-libs/glib:2
-   dev-libs/libfmt
-   dev-libs/libxml2:2
-   dev-libs/spdlog
-   net-misc/curl
-   "
-DEPEND="${RDEPEND}
-   $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
-BDEPEND="${PYTHON_DEPS}
-   virtual/pkgconfig
-   nls? (
-   dev-util/intltool
-   sys-devel/gettext
-   )
-   test? ( dev-util/cpputest )"
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-   has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-   # disable compress man pages
-   sed -i -e \
-   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
-   CMakeLists.txt || die
-
-   if [[ ${PV} != * ]]; then
-   sed -i \
-   -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
-   CMakeLists.txt || die
-   fi
-
-#  python_fix_shebang .
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DPYTHON_EXEC="${PYTHON}"
-   -DUSE_NLS=$(usex nls)
-   -DBUILD_TESTING=$(usex test)
-   )
-
-   cmake_src_configure
-}

diff --git a/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild 
b/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
deleted file mode 100644
index 7f173bed6432..
--- a/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
+++ /dev/null
@@ 

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

2022-11-09 Thread Florian Schmaus
commit: 2edd3aec83afec8ac125f1e3a28041976e43a80a
Author: Guillermo Joandet  gmail  com>
AuthorDate: Mon Oct  3 14:14:53 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Nov  9 16:27:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2edd3aec

app-text/cherrytree: Version bump to 0.99.51

Signed-off-by: Guillermo Joandet  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27593
Signed-off-by: Florian Schmaus  gentoo.org>

 app-text/cherrytree/Manifest  |  1 +
 app-text/cherrytree/cherrytree-0.99.51.ebuild | 87 +++
 app-text/cherrytree/metadata.xml  |  9 ++-
 3 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 8337beb3344f..cef193200d5b 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,3 +1,4 @@
 DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 
42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60
 SHA512 
2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
 DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 
1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742
 SHA512 
2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023
 DIST cherrytree_0.99.48.tar.xz 3474468 BLAKE2B 
b60cc2ffa4f5bd6e91e2a8b34811ad6977d46bdd02c7c1b2bfcdbf4df6107753a2390bc6a15daae8d5268af017ff52d217ab79ed5b4d5d107ef736257999b865
 SHA512 
eb4690bbc5865b9a0c7d0cb11341fe5ac17f11d417ad765b29784083a83f18c06a39b5b738838e3d57754de25adf1861ea4a6ad472e01a895e8fce0af0964926
+DIST cherrytree_0.99.51.tar.xz 4429456 BLAKE2B 
c4673e8c086882cb8be6b6d04cadb6353a82e3bb1c7062ab442992338154908a30a4cfd0b59101b7a88116846abcffaa213ddc37cd715df7eb133a333b881ae2
 SHA512 
98bcbfcb578970c9709f96926b0a9f5100ffe620453519e4292620fe9526c9134ac72f399703b045e4a433565d8a05e0f8fde126f48d458e7f9edb7b79ee34e6

diff --git a/app-text/cherrytree/cherrytree-0.99.51.ebuild 
b/app-text/cherrytree/cherrytree-0.99.51.ebuild
new file mode 100644
index ..b9a3c9d99fa5
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.51.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree/;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/giuspen/cherrytree;
+   S="${WORKDIR}/${P}/future"
+else
+   
SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz;
+   S="${WORKDIR}"/${P/-/_}
+
+   KEYWORDS="~amd64 ~x86"
+   # S="${WORKDIR}/${PN}-${COMMIT}/future"
+fi
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm:1.4
+   dev-db/sqlite:3
+   dev-libs/glib:2
+   dev-libs/libfmt:=
+   dev-libs/fribidi
+   dev-libs/spdlog
+   net-misc/curl
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango
+   x11-libs/vte:2.91"
+DEPEND="${PYTHON_DEPS}
+${RDEPEND}
+"
+BDEPEND="
+   virtual/pkgconfig
+   nls? (
+   sys-devel/gettext
+   )
+   test? ( dev-util/cpputest )"
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   if [[ ${PV} != * ]]; then
+   sed -i \
+   -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
+   CMakeLists.txt || die
+   fi
+
+   # python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   -DUSE_SHARED_FMT_SPDLOG=ON
+   )
+
+   cmake_src_configure
+}

diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
index 850e860f9c4d..99968430f90d 100644
--- a/app-text/cherrytree/metadata.xml
+++ b/app-text/cherrytree/metadata.xml
@@ -1,7 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+  

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

2022-07-17 Thread Sam James
commit: b7b9c245afbc71a60149bcaf4f57852aeb9400bc
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 17 23:51:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 18 00:26:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b9c245

app-text/cherrytree: add 0.99.48

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

 app-text/cherrytree/Manifest  |  1 +
 app-text/cherrytree/cherrytree-0.99.48.ebuild | 91 +++
 2 files changed, 92 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index b18ed8916d6a..8337beb3344f 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,2 +1,3 @@
 DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 
42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60
 SHA512 
2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
 DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 
1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742
 SHA512 
2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023
+DIST cherrytree_0.99.48.tar.xz 3474468 BLAKE2B 
b60cc2ffa4f5bd6e91e2a8b34811ad6977d46bdd02c7c1b2bfcdbf4df6107753a2390bc6a15daae8d5268af017ff52d217ab79ed5b4d5d107ef736257999b865
 SHA512 
eb4690bbc5865b9a0c7d0cb11341fe5ac17f11d417ad765b29784083a83f18c06a39b5b738838e3d57754de25adf1861ea4a6ad472e01a895e8fce0af0964926

diff --git a/app-text/cherrytree/cherrytree-0.99.48.ebuild 
b/app-text/cherrytree/cherrytree-0.99.48.ebuild
new file mode 100644
index ..7787d4048a92
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.48.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree 
https://github.com/giuspen/cherrytree;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/giuspen/cherrytree;
+   S="${WORKDIR}/${P}/future"
+else
+   
SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz;
+   
#SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}"/${P/-/_}
+
+   KEYWORDS="~amd64 ~x86"
+   # S="${WORKDIR}/${PN}-${COMMIT}/future"
+fi
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm:1.4
+   dev-db/sqlite:3
+   dev-libs/glib:2
+   dev-libs/libfmt:=
+   dev-libs/libxml2:2
+   dev-libs/fribidi
+   dev-libs/spdlog
+   net-misc/curl
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango"
+DEPEND="${RDEPEND}
+   $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
+BDEPEND="${PYTHON_DEPS}
+   virtual/pkgconfig
+   nls? (
+   sys-devel/gettext
+   )
+   test? ( dev-util/cpputest )"
+
+python_check_deps() {
+   has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   if [[ ${PV} != * ]]; then
+   sed -i \
+   -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
+   CMakeLists.txt || die
+   fi
+
+   # python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   -DUSE_SHARED_FMT_SPDLOG=ON
+   )
+
+   cmake_src_configure
+}



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

2022-05-03 Thread Sam James
commit: ae15f3d266dbd42b0c00b6858b823cd053c89c59
Author: Sam James  gentoo  org>
AuthorDate: Tue May  3 08:05:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  3 18:37:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae15f3d2

app-text/cherrytree: drop unnecessary intltool dep

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

 .../{cherrytree-0.99.47.ebuild => cherrytree-0.99.47-r1.ebuild}  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-text/cherrytree/cherrytree-0.99.47.ebuild 
b/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
similarity index 99%
rename from app-text/cherrytree/cherrytree-0.99.47.ebuild
rename to app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
index 6da5672e3e52..7f173bed6432 100644
--- a/app-text/cherrytree/cherrytree-0.99.47.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.47-r1.ebuild
@@ -54,7 +54,6 @@ DEPEND="${RDEPEND}
 BDEPEND="${PYTHON_DEPS}
virtual/pkgconfig
nls? (
-   dev-util/intltool
sys-devel/gettext
)
test? ( dev-util/cpputest )"



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

2022-04-17 Thread Sam James
commit: 02d2a2f08e4633de2d149ad6494efe9b7178ef46
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 17 16:02:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 16:02:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d2a2f0

app-text/cherrytree: add 0.99.47

Closes: https://bugs.gentoo.org/833995
Signed-off-by: Sam James  gentoo.org>

 app-text/cherrytree/Manifest  |  1 +
 app-text/cherrytree/cherrytree-0.99.47.ebuild | 91 +++
 2 files changed, 92 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 8b27173b2f61..2c2c695aec1a 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,2 +1,3 @@
 DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B 
cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9
 SHA512 
4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
 DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 
42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60
 SHA512 
2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800
+DIST cherrytree_0.99.47.tar.xz 2457904 BLAKE2B 
1072de8ed62757a873a258dc9ab1e9e186128b520e7f02e0a2cd8e7e0173232af7db85e3293efd21b577e51b6f5e55cca0cf35631e34279e32dc07836335b742
 SHA512 
2611be4c24a188793aa6785d96b33ec91c0957b30616352e1cb2cd12f296e39c29666d37a03016be6c934898bf6deb98af74c2c345d9c70f138f62ac6b10f023

diff --git a/app-text/cherrytree/cherrytree-0.99.47.ebuild 
b/app-text/cherrytree/cherrytree-0.99.47.ebuild
new file mode 100644
index ..6da5672e3e52
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.47.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-any-r1 xdg
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree 
https://github.com/giuspen/cherrytree;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/giuspen/cherrytree;
+   S="${WORKDIR}/${P}/future"
+else
+   
SRC_URI="https://github.com/giuspen/cherrytree/releases/download/${PV}/${P/-/_}.tar.xz;
+   
#SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}"/${P/-/_}
+
+   KEYWORDS="~amd64 ~x86"
+   # S="${WORKDIR}/${PN}-${COMMIT}/future"
+fi
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
+
+RDEPEND="app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm:1.4
+   dev-db/sqlite:3
+   dev-libs/glib:2
+   dev-libs/libfmt:=
+   dev-libs/libxml2:2
+   dev-libs/spdlog
+   net-misc/curl
+   x11-libs/cairo
+   x11-libs/gtk+:3
+   x11-libs/pango"
+DEPEND="${RDEPEND}
+   $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
+BDEPEND="${PYTHON_DEPS}
+   virtual/pkgconfig
+   nls? (
+   dev-util/intltool
+   sys-devel/gettext
+   )
+   test? ( dev-util/cpputest )"
+
+python_check_deps() {
+   has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   if [[ ${PV} != * ]]; then
+   sed -i \
+   -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
+   CMakeLists.txt || die
+   fi
+
+   # python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   -DUSE_SHARED_FMT_SPDLOG=ON
+   )
+
+   cmake_src_configure
+}



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

2021-05-24 Thread Joonas Niilola
commit: b7285e8f93398a9b62a8779972f81a72cb78d251
Author: Marian Kyral  email  cz>
AuthorDate: Mon May 24 07:01:11 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May 24 07:39:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7285e8f

app-text/cherrytree: bump to 0.99.37

Closes: https://bugs.gentoo.org/771927
Signed-off-by: Joonas Niilola  gentoo.org>

 app-text/cherrytree/Manifest  |   1 +
 app-text/cherrytree/cherrytree-0.99.37.ebuild | 101 ++
 2 files changed, 102 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 22a7dfb44bb..8b27173b2f6 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1 +1,2 @@
 DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B 
cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9
 SHA512 
4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
+DIST cherrytree-0.99.37.tar.gz 17983743 BLAKE2B 
42e5464f4cba4364dbbdabe5daaf80517a62f3f4b2c1c3efa764e9b10dfae492bf335403d24a7a33d9b7c8cd55a0c55ad359ffca1f639fa7622e00a416defd60
 SHA512 
2413924d03c65dfad820bc2b1e345b7dd74b69d11a10ee0d333400936eb31368f53f2aee77a3dd708adb3d4b91578c0499766bca4c85537822e9c4b3d41c6800

diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild 
b/app-text/cherrytree/cherrytree-0.99.37.ebuild
new file mode 100644
index 000..9e019516074
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.99.37.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit cmake python-any-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application (C++ version)"
+HOMEPAGE="https://www.giuspen.com/cherrytree 
https://github.com/giuspen/cherrytree;
+
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/giuspen/cherrytree;
+   S="${WORKDIR}/${P}/future"
+else
+   
SRC_URI="https://github.com/giuspen/cherrytree/archive/refs/tags/${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+#  S="${WORKDIR}/${PN}-${COMMIT}/future"
+fi
+
+# GPL-3 — future/src/ct (CherryTree)
+# LGPL-2.1 — future/src/7za (7zip)
+# MIT — future/src/fmt (libfmt)
+LICENSE="GPL-3 LGPL-2.1 MIT"
+SLOT="0"
+IUSE="nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   app-i18n/uchardet
+   app-text/gspell:=
+   >=dev-cpp/glibmm-2.64.2:2
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm
+   dev-db/sqlite:3
+   dev-libs/glib:2
+   dev-libs/libfmt
+   dev-libs/libxml2:2
+   dev-libs/spdlog
+   net-misc/curl
+   "
+DEPEND="${RDEPEND}
+   $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
+BDEPEND="${PYTHON_DEPS}
+   virtual/pkgconfig
+   nls? (
+   dev-util/intltool
+   sys-devel/gettext
+   )
+   test? ( dev-util/cpputest )"
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+   has_version "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+   # disable compress man pages
+   sed -i -e \
+   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
+   CMakeLists.txt || die
+
+   if [[ ${PV} != * ]]; then
+   sed -i \
+   -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
+   CMakeLists.txt || die
+   fi
+
+#  python_fix_shebang .
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DPYTHON_EXEC="${PYTHON}"
+   -DUSE_NLS=$(usex nls)
+   -DBUILD_TESTING=$(usex test)
+   )
+
+   cmake_src_configure
+}
+
+pkg_postinst() {
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}



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

2021-05-24 Thread Joonas Niilola
commit: 50973d1c552de16df29c2ed69fd072ca446463cd
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon May 24 07:01:44 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May 24 07:39:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50973d1c

app-text/cherrytree: PYTHON_COMPAT update in 0.99.37

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild 
b/app-text/cherrytree/cherrytree-0.99.37.ebuild
index 9e019516074..e9b910c3a2a 100644
--- a/app-text/cherrytree/cherrytree-0.99.37.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.37.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit cmake python-any-r1 xdg-utils
 



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

2021-05-24 Thread Joonas Niilola
commit: 020434f8d5c860353c7f70d6694fd45176cad61a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon May 24 07:39:07 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May 24 07:39:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=020434f8

app-text/cherrytree: specify pangomm:1.4 dep in 0.99.37

Signed-off-by: Joonas Niilola  gentoo.org>

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

diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild 
b/app-text/cherrytree/cherrytree-0.99.37.ebuild
index 3d9522397bc..2534d1a2e1c 100644
--- a/app-text/cherrytree/cherrytree-0.99.37.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.37.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
dev-cpp/gtkmm:3.0
dev-cpp/gtksourceviewmm:3.0
dev-cpp/libxmlpp:2.6
-   dev-cpp/pangomm
+   dev-cpp/pangomm:1.4
dev-db/sqlite:3
dev-libs/glib:2
dev-libs/libfmt



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

2021-05-24 Thread Joonas Niilola
commit: 107e28c256441a37b7dedd1438ccebbdb2261316
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon May 24 07:03:45 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May 24 07:39:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107e28c2

app-text/cherrytree: restrict tests in 0.99.37

Signed-off-by: Joonas Niilola  gentoo.org>

 app-text/cherrytree/cherrytree-0.99.37.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild 
b/app-text/cherrytree/cherrytree-0.99.37.ebuild
index 75074f280d1..3d9522397bc 100644
--- a/app-text/cherrytree/cherrytree-0.99.37.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.37.ebuild
@@ -27,7 +27,8 @@ LICENSE="GPL-3 LGPL-2.1 MIT"
 SLOT="0"
 IUSE="nls test"
 
-RESTRICT="!test? ( test )"
+# Has deps that aren't available in ::gentoo repo
+RESTRICT="test"
 
 RDEPEND="
app-i18n/uchardet



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

2021-05-24 Thread Joonas Niilola
commit: 2a484c37c846b49c024cadd767897b950a75e269
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon May 24 07:02:20 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May 24 07:39:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a484c37

app-text/cherrytree: inherit xdg.eclass in 0.99.37

Signed-off-by: Joonas Niilola  gentoo.org>

 app-text/cherrytree/cherrytree-0.99.37.ebuild | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/app-text/cherrytree/cherrytree-0.99.37.ebuild 
b/app-text/cherrytree/cherrytree-0.99.37.ebuild
index e9b910c3a2a..75074f280d1 100644
--- a/app-text/cherrytree/cherrytree-0.99.37.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.37.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..10} )
 
-inherit cmake python-any-r1 xdg-utils
+inherit cmake python-any-r1 xdg
 
 DESCRIPTION="A hierarchical note taking application (C++ version)"
 HOMEPAGE="https://www.giuspen.com/cherrytree 
https://github.com/giuspen/cherrytree;
@@ -87,15 +87,3 @@ src_configure() {
 
cmake_src_configure
 }
-
-pkg_postinst() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}



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

2021-05-23 Thread Michał Górny
commit: e54e22de7d7b30817a85f8ec95aa9afcb647d667
Author: Michał Górny  gentoo  org>
AuthorDate: Sun May 23 19:03:00 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May 23 19:04:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54e22de

app-text/cherrytree: Enable py3.9 & py3.10

Signed-off-by: Michał Górny  gentoo.org>

 app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild 
b/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
index 55a62632c25..8ea8d40b3a3 100644
--- a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit cmake python-any-r1 xdg-utils
 



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

2021-04-19 Thread Joonas Niilola
commit: dcb7dba8b9d9eb474a4d3686c545c0cb5f9e26d2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Apr 19 10:30:39 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Apr 19 10:30:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb7dba8

app-text/cherrytree: rm -, unfixed for 7+ months, still fails

Bug: https://bugs.gentoo.org/741218
Signed-off-by: Joonas Niilola  gentoo.org>

 app-text/cherrytree/cherrytree-.ebuild | 97 --
 1 file changed, 97 deletions(-)

diff --git a/app-text/cherrytree/cherrytree-.ebuild 
b/app-text/cherrytree/cherrytree-.ebuild
deleted file mode 100644
index 55a62632c25..000
--- a/app-text/cherrytree/cherrytree-.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit cmake python-any-r1 xdg-utils
-
-DESCRIPTION="A hierarchical note taking application (C++ version)"
-HOMEPAGE="https://www.giuspen.com/cherrytree 
https://github.com/giuspen/cherrytree;
-
-if [[ ${PV} == * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/giuspen/cherrytree;
-   S="${WORKDIR}/${P}/future"
-else
-   COMMIT="074a09ce3c1130ec60f5f5a3b8be958337b6d5ab" # 20200523
-   SRC_URI="https://github.com/giuspen/cherrytree/archive/${COMMIT}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-   S="${WORKDIR}/${PN}-${COMMIT}/future"
-fi
-
-# GPL-3 — future/src/ct (CherryTree)
-# LGPL-2.1 — future/src/7za (7zip)
-# MIT — future/src/fmt (libfmt)
-LICENSE="GPL-3 LGPL-2.1 MIT"
-SLOT="0"
-IUSE="nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   app-text/gspell:=
-   dev-libs/glib:2
-   >=dev-cpp/glibmm-2.64.2:2
-   dev-cpp/gtkmm:3.0
-   dev-cpp/gtksourceviewmm:3.0
-   dev-libs/libxml2:2
-   dev-cpp/libxmlpp:2.6
-   dev-cpp/pangomm:1.4
-   dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-   $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
-BDEPEND="${PYTHON_DEPS}
-   virtual/pkgconfig
-   nls? (
-   dev-util/intltool
-   sys-devel/gettext
-   )
-   test? ( dev-util/cpputest )"
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-   has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-   # disable compress man pages
-   sed -i -e \
-   
'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
-   CMakeLists.txt || die
-
-   if [[ ${PV} != * ]]; then
-   sed -i \
-   -e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
-   CMakeLists.txt || die
-   fi
-
-   python_fix_shebang .
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DPYTHON_EXEC="${PYTHON}"
-   -DUSE_NLS=$(usex nls)
-   -DBUILD_TESTING=$(usex test)
-   )
-
-   cmake_src_configure
-}
-
-pkg_postinst() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}



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

2021-04-06 Thread Sam James
commit: 326097ba8fb7304fb58082ea434f1357ed274844
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr  6 21:15:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr  6 21:15:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326097ba

app-text/cherrytree: retire proxied maintainer

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

 app-text/cherrytree/metadata.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
index 9b740e32b84..33e0b920375 100644
--- a/app-text/cherrytree/metadata.xml
+++ b/app-text/cherrytree/metadata.xml
@@ -1,14 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   em...@linxon.ru
-   Yury Martynov
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   
+   

giuspen/cherrytree




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

2021-02-15 Thread Matt Turner
commit: e48bfe8ff24393951f3342f386928ede7662face
Author: David Michael  gmail  com>
AuthorDate: Sat Feb  6 21:59:15 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Feb 16 01:25:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e48bfe8f

app-text/cherrytree: Specify the pangomm slot

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: David Michael  gmail.com>
Signed-off-by: Matt Turner  gentoo.org>

 ...-0.99.0_p20200523.ebuild => cherrytree-0.99.0_p20200523-r1.ebuild} | 4 ++--
 app-text/cherrytree/cherrytree-.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild 
b/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
similarity index 97%
rename from app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild
rename to app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
index a828bbf0917..55a62632c25 100644
--- a/app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ RDEPEND="
dev-cpp/gtksourceviewmm:3.0
dev-libs/libxml2:2
dev-cpp/libxmlpp:2.6
-   dev-cpp/pangomm
+   dev-cpp/pangomm:1.4
dev-db/sqlite:3"
 DEPEND="${RDEPEND}
$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"

diff --git a/app-text/cherrytree/cherrytree-.ebuild 
b/app-text/cherrytree/cherrytree-.ebuild
index a828bbf0917..55a62632c25 100644
--- a/app-text/cherrytree/cherrytree-.ebuild
+++ b/app-text/cherrytree/cherrytree-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,7 @@ RDEPEND="
dev-cpp/gtksourceviewmm:3.0
dev-libs/libxml2:2
dev-cpp/libxmlpp:2.6
-   dev-cpp/pangomm
+   dev-cpp/pangomm:1.4
dev-db/sqlite:3"
 DEPEND="${RDEPEND}
$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"



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

2020-05-23 Thread Andreas Sturmlechner
commit: 1fe26fad623252aae3888e2ff908c7922ff5cd01
Author: Yury Martynov  linxon  ru>
AuthorDate: Fri Apr 10 09:51:17 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 23 17:59:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fe26fad

app-text/cherrytree: bump to 0.99.0_p20200523 and drop 0.39.2 (C++ version)

Closes: https://bugs.gentoo.org/716874
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yury Martynov  linxon.ru>
Closes: https://github.com/gentoo/gentoo/pull/15285
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-text/cherrytree/Manifest   |  2 +-
 app-text/cherrytree/cherrytree-0.39.2.ebuild   | 96 -
 .../cherrytree/cherrytree-0.99.0_p20200523.ebuild  | 97 ++
 app-text/cherrytree/cherrytree-.ebuild | 97 ++
 4 files changed, 195 insertions(+), 97 deletions(-)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 9b9b8ef3fbf..762a81d7baf 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,3 +1,3 @@
 DIST cherrytree-0.37.0.tar.gz 703 BLAKE2B 
737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3
 SHA512 
a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
 DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 
4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09
 SHA512 
40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b
-DIST cherrytree-0.39.2.tar.gz 10044337 BLAKE2B 
352b6b709e62487015eccf817c4aec799586f64b9e07e38f1eab5e1491b36d8e2ae2f62f55f32248ca1f5cc0c0f610282493de2f3d4cf4e128ecb66acb895668
 SHA512 
46a02753f02f17e9696e21510ad93222843734a8be271e3a20d7a038856ad99ff2c8316d559e56567e877e419324fe3b254882bb1578a3c8d85c902169cb0e26
+DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B 
cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9
 SHA512 
4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54

diff --git a/app-text/cherrytree/cherrytree-0.39.2.ebuild 
b/app-text/cherrytree/cherrytree-0.39.2.ebuild
deleted file mode 100644
index 0c4f473d9b8..000
--- a/app-text/cherrytree/cherrytree-0.39.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools desktop python-any-r1 xdg-utils
-
-DESCRIPTION="A hierarchical note taking application"
-HOMEPAGE="https://www.giuspen.com/cherrytree;
-SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   dev-cpp/gtkmm:3.0
-   dev-cpp/gtksourceviewmm:3.0
-   dev-cpp/libxmlpp:2.6
-   dev-cpp/pangomm
-   dev-db/sqlite:3
-   dev-libs/libxml2:2"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-   dev-util/intltool
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )
-   test? ( dev-util/cpputest )"
-
-S="${S}/future"
-
-pkg_setup() {
-   python-any-r1_pkg_setup
-}
-
-src_prepare() {
-   default
-
-   python_fix_shebang "${S}"
-
-   sed -i \
-   -e "s|\(CT_VERSION.*{\)\(.*\)\(};\)$|\1\"${PV}\"\3|" \
-   src/ct/ct_const.cc || die
-
-   if ! use test; then
-   sed -i \
-   -e 
'/^PKG_CHECK_MODULES/s|\(\[.*\)cpputest\(.*\]\)|\1\2|' \
-   configure.ac || die
-   fi
-
-   eautoreconf
-}
-
-src_configure() {
-   econf $(use_enable nls)
-}
-
-src_install() {
-   default
-   pushd ../ >/dev/null || die
-
-   insinto /usr/share/mime/packages
-   doins linux/cherrytree.xml
-
-   insinto /usr/share/mime-info
-   doins linux/cherrytree.{mime,keys}
-
-   insinto /usr/share/metainfo
-   doins linux/cherrytree.appdata.xml
-
-   insinto /usr/share/application-registry
-   doins linux/cherrytree.applications
-
-   doicon -s scalable future/icons/cherrytree.svg
-   domenu linux/cherrytree.desktop
-   doman linux/cherrytree.1
-
-   popd >/dev/null || die
-}
-
-pkg_postinst() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}

diff --git a/app-text/cherrytree/cherrytree-0.99.0_p20200523.ebuild 

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

2020-04-09 Thread Joonas Niilola
commit: 993ab80b73acda80441c0889ff5d5586b3ff5c5d
Author: Yury Martynov  linxon  ru>
AuthorDate: Wed Mar 18 10:52:32 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Apr  9 08:54:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=993ab80b

app-text/cherrytree: bump to 0.39.2

Bug: https://bugs.gentoo.org/708094
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yury Martynov  linxon.ru>
Closes: https://github.com/gentoo/gentoo/pull/15235
Signed-off-by: Joonas Niilola  gentoo.org>

 app-text/cherrytree/Manifest |  1 +
 app-text/cherrytree/cherrytree-0.39.2.ebuild | 96 
 2 files changed, 97 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 171b610299a..9b9b8ef3fbf 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,2 +1,3 @@
 DIST cherrytree-0.37.0.tar.gz 703 BLAKE2B 
737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3
 SHA512 
a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
 DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 
4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09
 SHA512 
40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b
+DIST cherrytree-0.39.2.tar.gz 10044337 BLAKE2B 
352b6b709e62487015eccf817c4aec799586f64b9e07e38f1eab5e1491b36d8e2ae2f62f55f32248ca1f5cc0c0f610282493de2f3d4cf4e128ecb66acb895668
 SHA512 
46a02753f02f17e9696e21510ad93222843734a8be271e3a20d7a038856ad99ff2c8316d559e56567e877e419324fe3b254882bb1578a3c8d85c902169cb0e26

diff --git a/app-text/cherrytree/cherrytree-0.39.2.ebuild 
b/app-text/cherrytree/cherrytree-0.39.2.ebuild
new file mode 100644
index 000..0c4f473d9b8
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.39.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools desktop python-any-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application"
+HOMEPAGE="https://www.giuspen.com/cherrytree;
+SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-cpp/gtkmm:3.0
+   dev-cpp/gtksourceviewmm:3.0
+   dev-cpp/libxmlpp:2.6
+   dev-cpp/pangomm
+   dev-db/sqlite:3
+   dev-libs/libxml2:2"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+   dev-util/intltool
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+   test? ( dev-util/cpputest )"
+
+S="${S}/future"
+
+pkg_setup() {
+   python-any-r1_pkg_setup
+}
+
+src_prepare() {
+   default
+
+   python_fix_shebang "${S}"
+
+   sed -i \
+   -e "s|\(CT_VERSION.*{\)\(.*\)\(};\)$|\1\"${PV}\"\3|" \
+   src/ct/ct_const.cc || die
+
+   if ! use test; then
+   sed -i \
+   -e 
'/^PKG_CHECK_MODULES/s|\(\[.*\)cpputest\(.*\]\)|\1\2|' \
+   configure.ac || die
+   fi
+
+   eautoreconf
+}
+
+src_configure() {
+   econf $(use_enable nls)
+}
+
+src_install() {
+   default
+   pushd ../ >/dev/null || die
+
+   insinto /usr/share/mime/packages
+   doins linux/cherrytree.xml
+
+   insinto /usr/share/mime-info
+   doins linux/cherrytree.{mime,keys}
+
+   insinto /usr/share/metainfo
+   doins linux/cherrytree.appdata.xml
+
+   insinto /usr/share/application-registry
+   doins linux/cherrytree.applications
+
+   doicon -s scalable future/icons/cherrytree.svg
+   domenu linux/cherrytree.desktop
+   doman linux/cherrytree.1
+
+   popd >/dev/null || die
+}
+
+pkg_postinst() {
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}



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

2019-11-19 Thread Joonas Niilola
commit: 9c5073a7607d859022ce465370c77407f839a7e9
Author: Yury Martynov  linxon  ru>
AuthorDate: Tue Nov 19 11:45:12 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Nov 20 06:03:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c5073a7

app-text/cherrytree: 0.37.0 EAPI bump and other minor changes

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Yury Martynov  linxon.ru>
Signed-off-by: Joonas Niilola  gentoo.org>

 app-text/cherrytree/cherrytree-0.37.0-r1.ebuild | 52 +++
 app-text/cherrytree/cherrytree-0.37.0.ebuild| 55 -
 2 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild 
b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
new file mode 100644
index 000..b7c0b37e37f
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application"
+HOMEPAGE="https://www.giuspen.com/cherrytree;
+SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   dev-python/pyenchant[${PYTHON_USEDEP}]
+   dev-python/pygtk:2[${PYTHON_USEDEP}]
+   dev-python/pygtksourceview:2[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+python_prepare_all() {
+   sed -r -i \
+   -e '/\bupdate-desktop-database\b/d' \
+   setup.py || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+   use nls || mydistutilsargs+=( --without-gettext )
+}
+
+pkg_postinst() {
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}

diff --git a/app-text/cherrytree/cherrytree-0.37.0.ebuild 
b/app-text/cherrytree/cherrytree-0.37.0.ebuild
deleted file mode 100644
index 70d1db48a13..000
--- a/app-text/cherrytree/cherrytree-0.37.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=true
-
-inherit xdg distutils-r1
-
-DESCRIPTION="A hierarchical note taking application"
-HOMEPAGE="https://www.giuspen.com/cherrytree;
-LICENSE="GPL-3"
-
-SLOT="0"
-SRC_URI="https://github.com/giuspen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-   x11-libs/libX11
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   dev-python/pyenchant[${PYTHON_USEDEP}]
-   >=dev-python/pygtk-2.16:2[${PYTHON_USEDEP}]
-   dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-   nls? ( sys-devel/gettext )
-"
-
-PLOCALES="cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN"
-inherit l10n
-
-python_prepare_all() {
-   xdg_src_prepare
-
-   if use nls ; then
-   l10n_find_plocales_changes 'locale' '' '.po'
-
-   rm_loc() {
-   rm -v -f "locale/${1}.po" || return 1
-   }
-   l10n_for_each_disabled_locale_do rm_loc
-   fi
-
-   sed -r -e '/\bupdate-desktop-database\b/d' -i -- 'setup.py' || die
-
-   distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-   use nls || mydistutilsargs+=( --without-gettext )
-}



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

2019-11-19 Thread Joonas Niilola
commit: a3cbfceb71db4831649a4d23566435f6065c27ec
Author: Yury Martynov  linxon  ru>
AuthorDate: Tue Nov 19 11:46:27 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Nov 20 06:03:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3cbfceb

app-text/cherrytree: bump to 0.38.9

Closes: https://bugs.gentoo.org/645662
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Yury Martynov  linxon.ru>
Closes: https://github.com/gentoo/gentoo/pull/13688
Signed-off-by: Joonas Niilola  gentoo.org>

 app-text/cherrytree/Manifest   |  1 +
 app-text/cherrytree/cherrytree-0.38.9.ebuild   | 54 ++
 .../files/cherrytree-0.38.9_update_setup_py.patch  | 17 +++
 app-text/cherrytree/metadata.xml   |  9 +++-
 4 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 56eb10b4407..171b610299a 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1 +1,2 @@
 DIST cherrytree-0.37.0.tar.gz 703 BLAKE2B 
737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3
 SHA512 
a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
+DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 
4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09
 SHA512 
40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b

diff --git a/app-text/cherrytree/cherrytree-0.38.9.ebuild 
b/app-text/cherrytree/cherrytree-0.38.9.ebuild
new file mode 100644
index 000..80af20d9208
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.38.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application"
+HOMEPAGE="https://www.giuspen.com/cherrytree;
+SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   dev-python/pyenchant[${PYTHON_USEDEP}]
+   dev-python/pygtk:2[${PYTHON_USEDEP}]
+   dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
+   dev-python/lxml[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${P}_update_setup_py.patch )
+
+python_configure_all() {
+   use nls || mydistutilsargs+=( --without-gettext )
+}
+
+src_install() {
+   distutils-r1_src_install
+   python_optimize "${D}/usr/share/${PN}/modules"
+
+   dodoc README.md changelog.txt
+}
+
+pkg_postinst() {
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}

diff --git a/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch 
b/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch
new file mode 100644
index 000..aad93f93a15
--- /dev/null
+++ b/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch
@@ -0,0 +1,17 @@
+diff -ur a/setup.py b/setup.py
+--- a/setup.py 2019-08-17 14:23:16.0 +0300
 b/setup.py 2019-11-17 15:33:44.243070851 +0300
+@@ -195,7 +195,7 @@
+   ("share/mime-info", ["linux/cherrytree.mime", 
"linux/cherrytree.keys"]),
+   ("share/application-registry", 
["linux/cherrytree.applications"]),
+   ("share/metainfo", ["linux/cherrytree.appdata.xml"]),
+-  ("share/man/man1", ["linux/cherrytree.1.gz"])
++  ("share/man/man1", ["linux/cherrytree.1"])
+],
+cmdclass={
+ 'build': BuildData,
+@@ -205,4 +205,3 @@
+   },
+distclass=CherryTreeDist
+ )
+-subprocess.call("update-desktop-database")

diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
index e69a8d811bc..92aea49ad5a 100644
--- a/app-text/cherrytree/metadata.xml
+++ b/app-text/cherrytree/metadata.xml
@@ -1,7 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   em...@linxon.ru
+   Yury Martynov
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

giuspen/cherrytree




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

2018-04-08 Thread Aaron Bauman
commit: d7e0ee36034dafb3bbc83aad157e145f365aaf8e
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Apr  8 08:48:24 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Apr  9 00:10:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e0ee36

app-text/cherrytree: use HTTPS, use doublequotes

Closes: https://github.com/gentoo/gentoo/pull/7862

 app-text/cherrytree/cherrytree-0.37.0.ebuild | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-text/cherrytree/cherrytree-0.37.0.ebuild 
b/app-text/cherrytree/cherrytree-0.37.0.ebuild
index 5f140f1d728..70d1db48a13 100644
--- a/app-text/cherrytree/cherrytree-0.37.0.ebuild
+++ b/app-text/cherrytree/cherrytree-0.37.0.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
@@ -9,15 +9,15 @@ DISTUTILS_SINGLE_IMPL=true
 
 inherit xdg distutils-r1
 
-DESCRIPTION='A hierarchical note taking application'
-HOMEPAGE='http://www.giuspen.com/cherrytree'
-LICENSE='GPL-3'
+DESCRIPTION="A hierarchical note taking application"
+HOMEPAGE="https://www.giuspen.com/cherrytree;
+LICENSE="GPL-3"
 
-SLOT='0'
+SLOT="0"
 SRC_URI="https://github.com/giuspen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS='~amd64 ~x86'
-IUSE='nls'
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
 
 RDEPEND="
x11-libs/libX11
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
 "
 
-PLOCALES='cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN'
+PLOCALES="cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN"
 inherit l10n
 
 python_prepare_all() {



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

2016-09-17 Thread Pacho Ramos
commit: 1546020476757d99618e32b932335597492fbb08
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep 17 15:12:23 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep 17 15:12:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15460204

app-text/cherrytree: python[sqlite] needed (#592626 by Drew)

Package-Manager: portage-2.3.0

 app-text/cherrytree/cherrytree-0.37.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-text/cherrytree/cherrytree-0.37.0.ebuild 
b/app-text/cherrytree/cherrytree-0.37.0.ebuild
index 2b29653..a2169f2 100644
--- a/app-text/cherrytree/cherrytree-0.37.0.ebuild
+++ b/app-text/cherrytree/cherrytree-0.37.0.ebuild
@@ -5,6 +5,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=true
 
 inherit xdg distutils-r1



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

2016-07-07 Thread Austin English
commit: 3fc7232ad8477c3addad3eb2b6f1faa924a4a15f
Author: Austin English  gentoo  org>
AuthorDate: Thu Jul  7 21:51:24 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Thu Jul  7 22:50:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc7232a

app-text/cherrytree: add maintainer-needed

Package-Manager: portage-2.2.28

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

diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
index 097975e..6f49eba 100644
--- a/app-text/cherrytree/metadata.xml
+++ b/app-text/cherrytree/metadata.xml
@@ -1,4 +1,5 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+
 



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

2016-07-01 Thread Patrice Clement
commit: c71d95584a50dcd61b29668aaae69cc23f8bcad7
Author: Jan Chren  gmail  com>
AuthorDate: Wed Jun 22 20:52:59 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Jul  1 06:57:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c71d9558

app-text/cherrytree: update

- revert 52e5e711414bc5b3e803fbbe45c506c484c29df8
- switch to xdg.eclass
Closes: https://github.com/gentoo/gentoo/pull/1722

Signed-off-by: Patrice Clement  gentoo.org>

 app-text/cherrytree/cherrytree-0.37.0.ebuild | 14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app-text/cherrytree/cherrytree-0.37.0.ebuild 
b/app-text/cherrytree/cherrytree-0.37.0.ebuild
index 3d8fa89..2b29653 100644
--- a/app-text/cherrytree/cherrytree-0.37.0.ebuild
+++ b/app-text/cherrytree/cherrytree-0.37.0.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=true
 
-inherit fdo-mime distutils-r1
+inherit xdg distutils-r1
 
 DESCRIPTION='A hierarchical note taking application'
 HOMEPAGE='http://www.giuspen.com/cherrytree'
@@ -34,6 +34,8 @@ PLOCALES='cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk 
zh_CN'
 inherit l10n
 
 python_prepare_all() {
+   xdg_src_prepare
+
if use nls ; then
l10n_find_plocales_changes 'locale' '' '.po'
 
@@ -43,17 +45,11 @@ python_prepare_all() {
l10n_for_each_disabled_locale_do rm_loc
fi
 
-   sed -i '\|update-desktop-database|d' 'setup.py' || die
+   sed -r -e '/\bupdate-desktop-database\b/d' -i -- 'setup.py' || die
 
distutils-r1_python_prepare_all
 }
 
 python_configure_all() {
-   use nls || mydistutilsargs+=( '--without-gettext' )
-   distutils-r1_python_configure_all
-}
-
-pkg_postinst() {
-   fdo-mime_desktop_database_update
-   fdo-mime_mime_database_update
+   use nls || mydistutilsargs+=( --without-gettext )
 }



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

2016-07-01 Thread Patrice Clement
commit: 1dca784a30fb937144af6548c89df8af6e83343b
Author: Jan Chren  gmail  com>
AuthorDate: Wed Jun 22 21:24:35 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Jul  1 06:57:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dca784a

app-text/cherrytree: remove old v0.36.9

Closes: https://github.com/gentoo/gentoo/pull/1722

Signed-off-by: Patrice Clement  gentoo.org>

 app-text/cherrytree/Manifest|  1 -
 app-text/cherrytree/cherrytree-0.36.9-r1.ebuild | 59 -
 2 files changed, 60 deletions(-)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index c6fd335..67e9c36 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,2 +1 @@
-DIST cherrytree-0.36.9.tar.gz 8725402 SHA256 
37314cd9ba3e9bb87fb8ef9384da95db583543f2421f5243f7470d9903b3d8bf SHA512 
fca9679dc1508b5db1fea9b10f3434f24b4545a53c9a586f1b21298e134242705e4ecc050e0ebffc972caca63c5f2803245b1e65191eed19b82a9cbdec3a40aa
 WHIRLPOOL 
edec306131fc09bde6f470c7e8bb1f795d7e54e3d1d0093c421bf515724f8f7d48fc3d024569279ee6db2e46b270db68d41fa4a1f816dfb1f8c9df40380d350d
 DIST cherrytree-0.37.0.tar.gz 703 SHA256 
fa51071c8060fe337bf3092ab75188ce0bbd2ab1b34092607806787b116e54ed SHA512 
a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
 WHIRLPOOL 
59a8e68c9f2c031bf2acbee827dc73923f0e8f49ab9bf3a40f8b89683f0f2c343466783575b70a13821fc7409f47710fe089bbfcc4bc310a64cd78e68a25c319

diff --git a/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild 
b/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild
deleted file mode 100644
index 3d8fa89..000
--- a/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit fdo-mime distutils-r1
-
-DESCRIPTION='A hierarchical note taking application'
-HOMEPAGE='http://www.giuspen.com/cherrytree'
-LICENSE='GPL-3'
-
-SLOT='0'
-SRC_URI="https://github.com/giuspen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS='~amd64 ~x86'
-IUSE='nls'
-
-RDEPEND="
-   x11-libs/libX11
-   dev-python/dbus-python[${PYTHON_USEDEP}]
-   dev-python/pyenchant[${PYTHON_USEDEP}]
-   >=dev-python/pygtk-2.16:2[${PYTHON_USEDEP}]
-   dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-   nls? ( sys-devel/gettext )
-"
-
-PLOCALES='cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN'
-inherit l10n
-
-python_prepare_all() {
-   if use nls ; then
-   l10n_find_plocales_changes 'locale' '' '.po'
-
-   rm_loc() {
-   rm -v -f "locale/${1}.po" || return 1
-   }
-   l10n_for_each_disabled_locale_do rm_loc
-   fi
-
-   sed -i '\|update-desktop-database|d' 'setup.py' || die
-
-   distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-   use nls || mydistutilsargs+=( '--without-gettext' )
-   distutils-r1_python_configure_all
-}
-
-pkg_postinst() {
-   fdo-mime_desktop_database_update
-   fdo-mime_mime_database_update
-}



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

2016-07-01 Thread Patrice Clement
commit: 562c33b09723e25c816bc12bc77b5ad054c9fb17
Author: Jan Chren  gmail  com>
AuthorDate: Wed Jun 22 18:48:06 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Jul  1 06:57:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=562c33b0

app-text/cherrytree: bump to v0.37.0

Closes: https://github.com/gentoo/gentoo/pull/1722

Signed-off-by: Patrice Clement  gentoo.org>

 app-text/cherrytree/Manifest |  1 +
 app-text/cherrytree/cherrytree-0.37.0.ebuild | 59 
 2 files changed, 60 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 6b78200..c6fd335 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1 +1,2 @@
 DIST cherrytree-0.36.9.tar.gz 8725402 SHA256 
37314cd9ba3e9bb87fb8ef9384da95db583543f2421f5243f7470d9903b3d8bf SHA512 
fca9679dc1508b5db1fea9b10f3434f24b4545a53c9a586f1b21298e134242705e4ecc050e0ebffc972caca63c5f2803245b1e65191eed19b82a9cbdec3a40aa
 WHIRLPOOL 
edec306131fc09bde6f470c7e8bb1f795d7e54e3d1d0093c421bf515724f8f7d48fc3d024569279ee6db2e46b270db68d41fa4a1f816dfb1f8c9df40380d350d
+DIST cherrytree-0.37.0.tar.gz 703 SHA256 
fa51071c8060fe337bf3092ab75188ce0bbd2ab1b34092607806787b116e54ed SHA512 
a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
 WHIRLPOOL 
59a8e68c9f2c031bf2acbee827dc73923f0e8f49ab9bf3a40f8b89683f0f2c343466783575b70a13821fc7409f47710fe089bbfcc4bc310a64cd78e68a25c319

diff --git a/app-text/cherrytree/cherrytree-0.37.0.ebuild 
b/app-text/cherrytree/cherrytree-0.37.0.ebuild
new file mode 100644
index 000..3d8fa89
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.37.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=true
+
+inherit fdo-mime distutils-r1
+
+DESCRIPTION='A hierarchical note taking application'
+HOMEPAGE='http://www.giuspen.com/cherrytree'
+LICENSE='GPL-3'
+
+SLOT='0'
+SRC_URI="https://github.com/giuspen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS='~amd64 ~x86'
+IUSE='nls'
+
+RDEPEND="
+   x11-libs/libX11
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   dev-python/pyenchant[${PYTHON_USEDEP}]
+   >=dev-python/pygtk-2.16:2[${PYTHON_USEDEP}]
+   dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+   nls? ( sys-devel/gettext )
+"
+
+PLOCALES='cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN'
+inherit l10n
+
+python_prepare_all() {
+   if use nls ; then
+   l10n_find_plocales_changes 'locale' '' '.po'
+
+   rm_loc() {
+   rm -v -f "locale/${1}.po" || return 1
+   }
+   l10n_for_each_disabled_locale_do rm_loc
+   fi
+
+   sed -i '\|update-desktop-database|d' 'setup.py' || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+   use nls || mydistutilsargs+=( '--without-gettext' )
+   distutils-r1_python_configure_all
+}
+
+pkg_postinst() {
+   fdo-mime_desktop_database_update
+   fdo-mime_mime_database_update
+}



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

2016-05-29 Thread Kristian Fiskerstrand
commit: 64186182be8b083ae91d933ef09409cac1d33c4f
Author: Kristian Fiskerstrand  gentoo  org>
AuthorDate: Sun May 29 15:23:29 2016 +
Commit: Kristian Fiskerstrand  gentoo  org>
CommitDate: Sun May 29 15:29:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64186182

app-text/cherrytree: Dropping to maintainer-needed

Gentoo-Bug: 584246

Package-Manager: portage-2.3.0_rc1

 app-text/cherrytree/metadata.xml | 9 -
 1 file changed, 9 deletions(-)

diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
index e9a8f55..097975e 100644
--- a/app-text/cherrytree/metadata.xml
+++ b/app-text/cherrytree/metadata.xml
@@ -1,13 +1,4 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   dev.rindeal+bugs.gentoo@gmail.com
-   Jan Chren (rindeal)
-   Proxied maintainer; set to assignee in all 
bugs
-
-
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-
 



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

2016-04-20 Thread Ian Delaney
commit: 52e5e711414bc5b3e803fbbe45c506c484c29df8
Author: Ian Delaney  gentoo  org>
AuthorDate: Tue Apr 19 23:27:34 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Wed Apr 20 09:14:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52e5e711

app-text/cherrytree: add a safety net to configure phase

Package-Manager: portage-2.2.28

 app-text/cherrytree/cherrytree-0.36.9-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild 
b/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild
index 8f6b242..3d8fa89 100644
--- a/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild
@@ -50,6 +50,7 @@ python_prepare_all() {
 
 python_configure_all() {
use nls || mydistutilsargs+=( '--without-gettext' )
+   distutils-r1_python_configure_all
 }
 
 pkg_postinst() {



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

2016-04-19 Thread Ian Delaney
commit: 4b94535991c7540844f5f1dce2ff8bca5275dd0f
Author: Ian Delaney  gentoo  org>
AuthorDate: Tue Apr 19 16:25:42 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Apr 19 17:09:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b945359

app-text/cherrytree: reset configure phase from previous edit

src_configure phase reset to python_configure_all,
SRC_URI reduced by substituting with ${PN}

Package-Manager: portage-2.2.28

 app-text/cherrytree/cherrytree-0.36.9-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild 
b/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild
index d952e2d..8f6b242 100644
--- a/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE='http://www.giuspen.com/cherrytree'
 LICENSE='GPL-3'
 
 SLOT='0'
-SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="https://github.com/giuspen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS='~amd64 ~x86'
 IUSE='nls'
@@ -48,7 +48,7 @@ python_prepare_all() {
distutils-r1_python_prepare_all
 }
 
-src_configure() {
+python_configure_all() {
use nls || mydistutilsargs+=( '--without-gettext' )
 }
 



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

2016-04-19 Thread Ian Delaney
commit: 5df0f3c04bb7a0d838c06cf92e98eae80e1e6d13
Author: Jan Chren 
AuthorDate: Sat Apr 16 11:10:00 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Apr 19 14:00:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5df0f3c0

app-text/cherrytree: fix sandbox issue

Gentoo-Bug: 580190
Closes: https://github.com/gentoo/gentoo/pull/1280

Signed-off-by: Ian Delaney  gentoo.org>

 app-text/cherrytree/cherrytree-0.36.9.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app-text/cherrytree/cherrytree-0.36.9.ebuild 
b/app-text/cherrytree/cherrytree-0.36.9.ebuild
index 814789c..01d044e 100644
--- a/app-text/cherrytree/cherrytree-0.36.9.ebuild
+++ b/app-text/cherrytree/cherrytree-0.36.9.ebuild
@@ -35,6 +35,8 @@ inherit l10n
 src_prepare() {
use nls && l10n_find_plocales_changes 'locale' '' '.po'
 
+   sed -i '\|update-desktop-database|d' 'setup.py' || die
+
default
 }
 



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

2016-04-19 Thread Ian Delaney
commit: 6663b5182d5ea3212954f6ed9684cc76029d9b48
Author: Jan Chren 
AuthorDate: Sat Apr 16 17:27:25 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Apr 19 14:00:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6663b518

app-text/cherrytree: bump revision + delete the old one

Closes: https://github.com/gentoo/gentoo/pull/1280

Signed-off-by: Ian Delaney  gentoo.org>

 .../cherrytree/{cherrytree-0.36.9.ebuild => cherrytree-0.36.9-r1.ebuild}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-text/cherrytree/cherrytree-0.36.9.ebuild 
b/app-text/cherrytree/cherrytree-0.36.9-r1.ebuild
similarity index 100%
rename from app-text/cherrytree/cherrytree-0.36.9.ebuild
rename to app-text/cherrytree/cherrytree-0.36.9-r1.ebuild



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

2016-04-19 Thread Ian Delaney
commit: b9e68340b6da0563c78b4bb3519c9caacd4c6af8
Author: Jan Chren 
AuthorDate: Sat Apr 16 17:06:20 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Apr 19 14:00:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e68340

app-text/cherrytree: add x86 KEYWORD

Closes: https://github.com/gentoo/gentoo/pull/1280

Signed-off-by: Ian Delaney  gentoo.org>

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

diff --git a/app-text/cherrytree/cherrytree-0.36.9.ebuild 
b/app-text/cherrytree/cherrytree-0.36.9.ebuild
index 01d044e..2c856c0 100644
--- a/app-text/cherrytree/cherrytree-0.36.9.ebuild
+++ b/app-text/cherrytree/cherrytree-0.36.9.ebuild
@@ -15,7 +15,7 @@ LICENSE='GPL-3'
 SLOT='0'
 SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> 
${P}.tar.gz"
 
-KEYWORDS='~amd64'
+KEYWORDS='~amd64 ~x86'
 IUSE='nls'
 
 RDEPEND="${PYTHON_DEPS}



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

2016-04-19 Thread Ian Delaney
commit: c59f27ee7d631913a2afd3502b785d6bde76a762
Author: Jan Chren 
AuthorDate: Sat Apr 16 11:46:24 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Tue Apr 19 14:00:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c59f27ee

app-text/cherrytree: migrate to distutils-r1.eclass

Closes: https://github.com/gentoo/gentoo/pull/1280

Signed-off-by: Ian Delaney  gentoo.org>

 app-text/cherrytree/cherrytree-0.36.9.ebuild | 50 +---
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/app-text/cherrytree/cherrytree-0.36.9.ebuild 
b/app-text/cherrytree/cherrytree-0.36.9.ebuild
index 2c856c0..d952e2d 100644
--- a/app-text/cherrytree/cherrytree-0.36.9.ebuild
+++ b/app-text/cherrytree/cherrytree-0.36.9.ebuild
@@ -5,8 +5,9 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=true
 
-inherit fdo-mime eutils python-single-r1
+inherit fdo-mime distutils-r1
 
 DESCRIPTION='A hierarchical note taking application'
 HOMEPAGE='http://www.giuspen.com/cherrytree'
@@ -18,7 +19,7 @@ 
SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.
 KEYWORDS='~amd64 ~x86'
 IUSE='nls'
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
x11-libs/libX11
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/pyenchant[${PYTHON_USEDEP}]
@@ -32,44 +33,23 @@ DEPEND="${RDEPEND}
 PLOCALES='cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN'
 inherit l10n
 
-src_prepare() {
-   use nls && l10n_find_plocales_changes 'locale' '' '.po'
-
-   sed -i '\|update-desktop-database|d' 'setup.py' || die
+python_prepare_all() {
+   if use nls ; then
+   l10n_find_plocales_changes 'locale' '' '.po'
 
-   default
-}
+   rm_loc() {
+   rm -v -f "locale/${1}.po" || return 1
+   }
+   l10n_for_each_disabled_locale_do rm_loc
+   fi
 
-src_compile() {
-   local args=()
-   use nls || args+=( '--without-gettext' )
+   sed -i '\|update-desktop-database|d' 'setup.py' || die
 
-   "${EPYTHON}" ./setup.py "${args[@]}" build
+   distutils-r1_python_prepare_all
 }
 
-src_install() {
-   dobin "${PN}"
-
-   doicon -s scalable "glade/svg/${PN}.svg"
-   domenu "linux/${PN}.desktop"
-   doman "linux/${PN}.1"
-
-   insinto "/usr/share/${PN}"
-   doins -r 'glade/' 'modules/' 'language-specs/'
-
-   insinto '/usr/share/mime-info'
-   doins "linux/${PN}".{mime,keys}
-   insinto '/usr/share/mime/packages'
-   doins "linux/${PN}.xml"
-
-   if use nls ; then
-   ins_loc() {
-   # cannot use domo() as it installs files into a wrong 
dir
-   insinto "/usr/share/locale/${1}/LC_MESSAGES"
-   doins "build/mo/${1}/${PN}.mo"
-   }
-   l10n_for_each_locale_do ins_loc
-   fi
+src_configure() {
+   use nls || mydistutilsargs+=( '--without-gettext' )
 }
 
 pkg_postinst() {



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

2016-04-15 Thread Patrice Clement
commit: 1561088e0875f702d5b569eed05a3bcbfdcb5934
Author: Jan Chren 
AuthorDate: Fri Apr 15 16:44:01 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Apr 15 18:56:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1561088e

app-text/cherrytree: new package

Closes: https://github.com/gentoo/gentoo/pull/1266

Signed-off-by: Patrice Clement  gentoo.org>

 app-text/cherrytree/Manifest |  1 +
 app-text/cherrytree/cherrytree-0.36.9.ebuild | 76 
 app-text/cherrytree/metadata.xml | 13 +
 3 files changed, 90 insertions(+)

diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
new file mode 100644
index 000..6b78200
--- /dev/null
+++ b/app-text/cherrytree/Manifest
@@ -0,0 +1 @@
+DIST cherrytree-0.36.9.tar.gz 8725402 SHA256 
37314cd9ba3e9bb87fb8ef9384da95db583543f2421f5243f7470d9903b3d8bf SHA512 
fca9679dc1508b5db1fea9b10f3434f24b4545a53c9a586f1b21298e134242705e4ecc050e0ebffc972caca63c5f2803245b1e65191eed19b82a9cbdec3a40aa
 WHIRLPOOL 
edec306131fc09bde6f470c7e8bb1f795d7e54e3d1d0093c421bf515724f8f7d48fc3d024569279ee6db2e46b270db68d41fa4a1f816dfb1f8c9df40380d350d

diff --git a/app-text/cherrytree/cherrytree-0.36.9.ebuild 
b/app-text/cherrytree/cherrytree-0.36.9.ebuild
new file mode 100644
index 000..814789c
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.36.9.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime eutils python-single-r1
+
+DESCRIPTION='A hierarchical note taking application'
+HOMEPAGE='http://www.giuspen.com/cherrytree'
+LICENSE='GPL-3'
+
+SLOT='0'
+SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+KEYWORDS='~amd64'
+IUSE='nls'
+
+RDEPEND="${PYTHON_DEPS}
+   x11-libs/libX11
+   dev-python/dbus-python[${PYTHON_USEDEP}]
+   dev-python/pyenchant[${PYTHON_USEDEP}]
+   >=dev-python/pygtk-2.16:2[${PYTHON_USEDEP}]
+   dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+   nls? ( sys-devel/gettext )
+"
+
+PLOCALES='cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN'
+inherit l10n
+
+src_prepare() {
+   use nls && l10n_find_plocales_changes 'locale' '' '.po'
+
+   default
+}
+
+src_compile() {
+   local args=()
+   use nls || args+=( '--without-gettext' )
+
+   "${EPYTHON}" ./setup.py "${args[@]}" build
+}
+
+src_install() {
+   dobin "${PN}"
+
+   doicon -s scalable "glade/svg/${PN}.svg"
+   domenu "linux/${PN}.desktop"
+   doman "linux/${PN}.1"
+
+   insinto "/usr/share/${PN}"
+   doins -r 'glade/' 'modules/' 'language-specs/'
+
+   insinto '/usr/share/mime-info'
+   doins "linux/${PN}".{mime,keys}
+   insinto '/usr/share/mime/packages'
+   doins "linux/${PN}.xml"
+
+   if use nls ; then
+   ins_loc() {
+   # cannot use domo() as it installs files into a wrong 
dir
+   insinto "/usr/share/locale/${1}/LC_MESSAGES"
+   doins "build/mo/${1}/${PN}.mo"
+   }
+   l10n_for_each_locale_do ins_loc
+   fi
+}
+
+pkg_postinst() {
+   fdo-mime_desktop_database_update
+   fdo-mime_mime_database_update
+}

diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
new file mode 100644
index 000..e9a8f55
--- /dev/null
+++ b/app-text/cherrytree/metadata.xml
@@ -0,0 +1,13 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+   dev.rindeal+bugs.gentoo@gmail.com
+   Jan Chren (rindeal)
+   Proxied maintainer; set to assignee in all 
bugs
+
+
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+
+