* [gentoo-commits] repo/gentoo:master commit in: dev-libs/cdk/files/, dev-libs/cdk/
@ 2024-03-04 10:36 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-03-04 10:36 UTC (permalink / raw
To: gentoo-commits
commit: 116bee647fd3c0e5649b76d8454a0fc03ba066aa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 10:32:38 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 10:35:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=116bee64
dev-libs/cdk: drop 5.0.20210324-r2, 5.0.20221025
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/cdk/Manifest | 3 --
dev-libs/cdk/cdk-5.0.20210324-r2.ebuild | 54 --------------------
dev-libs/cdk/cdk-5.0.20221025.ebuild | 59 ----------------------
.../cdk/files/cdk-5.0.20120323-parallel-make.patch | 12 -----
4 files changed, 128 deletions(-)
diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest
index cebc82602311..3f5daadd8820 100644
--- a/dev-libs/cdk/Manifest
+++ b/dev-libs/cdk/Manifest
@@ -1,5 +1,2 @@
-DIST cdk-5.0-20210324.tgz 548203 BLAKE2B 7a944f347bf30a6bf602b9ac61fa547c7b4aef073db54272e4a8d2bd7d83093888f2ca9e5ee9c2d067777472d2abb87cca42b2912b0491b81472cfce086640b8 SHA512 72d62307824708858ca4fb3865d332cc81e987d7ef685011cf127c8f77cee3e19fe9dd6a35009d4416769cb00f04e937ebaec686c61ca0ba58655f522a175a59
-DIST cdk-5.0-20221025.tgz 540925 BLAKE2B 48b37d07630bc71fc5b1a77fa2732c264e61323fc00c60db1436403db46bfc4f870fa897560b705583b07db84b8f812df553780f4bddef4ca88de6b799c31f57 SHA512 408ab61f8110c13d32976896e92f8ded4927eac36435bce6d9fafbe137e693779ffd882829712086868766a252e35e6c592da69c43cfb32d9f4cf7e880c2a593
-DIST cdk-5.0-20221025.tgz.asc 729 BLAKE2B 0e6d0fdfcdb7e8a2139b5050cd2ff79f493edb67a0119baf5b009a00ea9fe715bb85da7980f35dbf688462b8dc07fc1e630101b072111fc626696bb90d318dc8 SHA512 66c52ac973fa6c133ae5a76b1661980b6a32144854c518f9bcddce8bd0b28e60167f8e09f87b99bff59e996275b3844f2c1c4b20d0a40a784700f53394fcbbcc
DIST cdk-5.0-20230201.tgz 533972 BLAKE2B 8667583ea1401ab04dc43dbd93f8580ee898c351f52552889fb642f38ad85536f5fbcc6724659bff83a1f9adc1addf5632c39d9162b628efd341f45e94b2b823 SHA512 2b072dc5eba66bb043f56c5d558ddafb0d9281160107f901b5b4c262182946b7c55cf5b1bdf0d0536fd7db6d95fd6b3ddd9dd367fccc63bb0d95eb3c98da58fd
DIST cdk-5.0-20230201.tgz.asc 729 BLAKE2B 9076836bb6fd8f89ad4c474b7fc2beb3fa9fd16a3c2d530ce34052af65231e2d77f3879d02ca031be6a7bdac6bba29f40bac3320fc513fc3ba5e617316184ed4 SHA512 85e80c49049da9cd335013e564fd15929a127b3fec24bdb50d153196b47f4092c353a7bd6a40211566a7f4d09701cc75d66f9b3b32fed50c6b728e17dc7a166a
diff --git a/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild b/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild
deleted file mode 100644
index 5e37532139ba..000000000000
--- a/dev-libs/cdk/cdk-5.0.20210324-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-$(ver_rs 2 -)"
-
-DESCRIPTION="A library of curses widgets"
-HOMEPAGE="https://dickey.his.com/cdk/cdk.html https://github.com/ThomasDickey/cdk-snapshots"
-SRC_URI="ftp://ftp.invisible-island.net/cdk/${MY_P}.tgz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="BSD"
-SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples unicode"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)?]"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch )
-
-src_configure() {
- if [[ ${CHOST} == *-*-darwin* ]] ; then
- export ac_cv_prog_LIBTOOL=glibtool
- fi
-
- # --with-libtool dropped for now because of broken Makefile
- # bug #790773
- econf \
- --disable-rpath-hack \
- --with-shared \
- --with-pkg-config \
- --with-ncurses$(usex unicode "w" "")
-}
-
-src_install() {
- # parallel make installs duplicate libs
- emake -j1 \
- DESTDIR="${D}" \
- DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" \
- install
-
- if use examples ; then
- local x
- for x in include c++ demos examples cli cli/utils cli/samples ; do
- docinto ${x}
- find ${x} -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc || die
- done
- fi
-
- find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete || die
-}
diff --git a/dev-libs/cdk/cdk-5.0.20221025.ebuild b/dev-libs/cdk/cdk-5.0.20221025.ebuild
deleted file mode 100644
index 211f5797ba83..000000000000
--- a/dev-libs/cdk/cdk-5.0.20221025.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${PN}-$(ver_rs 2 -)"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc
-inherit verify-sig
-
-DESCRIPTION="A library of curses widgets"
-HOMEPAGE="https://dickey.his.com/cdk/cdk.html https://github.com/ThomasDickey/cdk-snapshots"
-SRC_URI="https://invisible-island.net/archives/${PN}/${MY_P}.tgz"
-SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${MY_P}.tgz.asc )"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples unicode"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)?]"
-RDEPEND="${DEPEND}"
-BDEPEND="
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
-"
-
-src_configure() {
- if [[ ${CHOST} == *-*-darwin* ]] ; then
- export ac_cv_prog_LIBTOOL=glibtool
- fi
-
- # --with-libtool dropped for now because of broken Makefile
- # bug #790773
- econf \
- --disable-rpath-hack \
- --with-shared \
- --with-pkg-config \
- --with-ncurses$(usex unicode "w" "")
-}
-
-src_install() {
- # parallel make installs duplicate libs
- emake -j1 \
- DESTDIR="${D}" \
- DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" \
- install
-
- if use examples ; then
- local x
- for x in include c++ demos examples cli cli/utils cli/samples ; do
- docinto ${x}
- find ${x} -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc || die
- done
- fi
-
- find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete || die
-}
diff --git a/dev-libs/cdk/files/cdk-5.0.20120323-parallel-make.patch b/dev-libs/cdk/files/cdk-5.0.20120323-parallel-make.patch
deleted file mode 100644
index aa5a1dce04e7..000000000000
--- a/dev-libs/cdk/files/cdk-5.0.20120323-parallel-make.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -269,7 +269,7 @@
-
- all sources :: $(AUTO_SRC)
-
--$(OBJECTS) : include/cdk_config.h
-+$(OBJECTS) : $(MY_HDR)
-
- #
- # Standard library directive.
-
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/cdk/files/, dev-libs/cdk/
@ 2024-12-21 2:54 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-12-21 2:54 UTC (permalink / raw
To: gentoo-commits
commit: 723ef79cdb271b6b0e0d90610f3c1ac824d85558
Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Fri Dec 20 14:36:48 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 02:54:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=723ef79c
dev-libs/cdk: fix handling of -lcdk or -lcdkw
lib name is depend on USE flag 'unicode', but for unknown reason,
upstream remove XLIB in release 5.0.20240619 (always -lcdk instead
of -lcdkw if unicode is enabled), which cause link failed if
USE="unicode".
Closes: https://bugs.gentoo.org/831226
Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39795
Signed-off-by: Sam James <sam <AT> gentoo.org>
....20240619.ebuild => cdk-5.0.20240619-r1.ebuild} | 4 ++++
dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch | 28 ++++++++++++++++++++++
dev-libs/cdk/metadata.xml | 9 ++++++-
3 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/dev-libs/cdk/cdk-5.0.20240619.ebuild b/dev-libs/cdk/cdk-5.0.20240619-r1.ebuild
similarity index 96%
rename from dev-libs/cdk/cdk-5.0.20240619.ebuild
rename to dev-libs/cdk/cdk-5.0.20240619-r1.ebuild
index a490d9d8bb0e..b2fe41e7d07a 100644
--- a/dev-libs/cdk/cdk-5.0.20240619.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20240619-r1.ebuild
@@ -26,6 +26,10 @@ BDEPEND="
verify-sig? ( sec-keys/openpgp-keys-thomasdickey )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.0.20240619-xlib.patch"
+)
+
src_configure() {
if [[ ${CHOST} == *-*-darwin* ]] ; then
export ac_cv_prog_LIBTOOL=glibtool
diff --git a/dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch b/dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch
new file mode 100644
index 000000000000..e346fd8e24f4
--- /dev/null
+++ b/dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/831226
+
+lib name is depend on USE flag 'unicode', but for unknown reason,
+upstream remove XLIB in release 5.0.20240619 (always -lcdk instead
+of -lcdkw if unicode is enabled), which cause link failed if
+USE="unicode".
+
+diff --git a/cdk-config.in b/cdk-config.in
+index 19b2972..aa0b2c8 100644
+--- a/cdk-config.in
++++ b/cdk-config.in
+@@ -41,6 +41,7 @@ same_prefix=yes
+ same_exec_prefix=yes
+
+ THIS="@PACKAGE@"
++XLIB="@LIB_ROOTNAME@"
+
+ [ $# = 0 ] && exec @SHELL@ "$0" --error
+
+@@ -66,7 +67,7 @@ while [ $# -gt 0 ]; do
+
+ eval LDFLAGS='"@LDFLAGS@"'
+ eval LIBS='"@LIBS@"'
+- LIBS="-l${THIS} $LIBS"
++ LIBS="-l${XLIB} $LIBS"
+
+ # If the directory given by --libdir is not in the LDFLAGS+LIBS set,
+ # prepend it to LDFLAGS to help link this application's library.
diff --git a/dev-libs/cdk/metadata.xml b/dev-libs/cdk/metadata.xml
index f683d1054e8f..69097ea69330 100644
--- a/dev-libs/cdk/metadata.xml
+++ b/dev-libs/cdk/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>zhixu.liu@gmail.com</email>
+ <name>Z. Liu</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<changelog>https://dickey.his.com/cdk/CHANGES.html</changelog>
<remote-id type="github">ThomasDickey/cdk-snapshots</remote-id>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-21 2:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-04 10:36 [gentoo-commits] repo/gentoo:master commit in: dev-libs/cdk/files/, dev-libs/cdk/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-12-21 2:54 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox