From d2bcdab82e5f5f38a8ab54026e8aa94edb1b77a6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Dec 2024 06:30:52 +0000 Subject: gentoo auto-resync : 21:12:2024 - 06:30:51 --- dev-libs/cdk/Manifest | 5 +- dev-libs/cdk/cdk-5.0.20240619-r1.ebuild | 69 ++++++++++++++++++++++++++ dev-libs/cdk/cdk-5.0.20240619.ebuild | 65 ------------------------ dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch | 28 +++++++++++ dev-libs/cdk/metadata.xml | 9 +++- 5 files changed, 108 insertions(+), 68 deletions(-) create mode 100644 dev-libs/cdk/cdk-5.0.20240619-r1.ebuild delete mode 100644 dev-libs/cdk/cdk-5.0.20240619.ebuild create mode 100644 dev-libs/cdk/files/cdk-5.0.20240619-xlib.patch (limited to 'dev-libs/cdk') diff --git a/dev-libs/cdk/Manifest b/dev-libs/cdk/Manifest index 7b854906a4ae..7ebfe7cec7d8 100644 --- a/dev-libs/cdk/Manifest +++ b/dev-libs/cdk/Manifest @@ -1,3 +1,4 @@ +AUX cdk-5.0.20240619-xlib.patch 784 BLAKE2B c51896110ccd402bc87cee4f20b5ae6a22c1695b36058459b85b13aa54739a77f48d8dbc84b62ba2def19cc6dcb549261f8d1e14303ec692e305510013d170af SHA512 5f429d562e198967f0df010013e95cb5fbf439343c0f3b21960356cb31b10c1e7bca4ae3a35b8904e23d6b5589abf284ab36ca1b3b7547921f84875aee231d80 DIST cdk-5.0-20230201.tgz 533972 BLAKE2B 8667583ea1401ab04dc43dbd93f8580ee898c351f52552889fb642f38ad85536f5fbcc6724659bff83a1f9adc1addf5632c39d9162b628efd341f45e94b2b823 SHA512 2b072dc5eba66bb043f56c5d558ddafb0d9281160107f901b5b4c262182946b7c55cf5b1bdf0d0536fd7db6d95fd6b3ddd9dd367fccc63bb0d95eb3c98da58fd DIST cdk-5.0-20230201.tgz.asc 729 BLAKE2B 9076836bb6fd8f89ad4c474b7fc2beb3fa9fd16a3c2d530ce34052af65231e2d77f3879d02ca031be6a7bdac6bba29f40bac3320fc513fc3ba5e617316184ed4 SHA512 85e80c49049da9cd335013e564fd15929a127b3fec24bdb50d153196b47f4092c353a7bd6a40211566a7f4d09701cc75d66f9b3b32fed50c6b728e17dc7a166a DIST cdk-5.0-20240331.tgz 538287 BLAKE2B 0d4e3b8d04056aa658e94a29a836cdc4f82c2281783c11eb74715724befe983954b14ae9aae4dd4e17e772d711becb798107e910234aba02fe626e004ef6f216 SHA512 dfd5a038ec839e7cfe8850d41bace4cf34b44cf7a52c60912838051a959ecd6b2077a29b1dc152425ce518f5c578236bfa4d6736eaa096727e08bd16785d4d34 @@ -7,5 +8,5 @@ DIST cdk-5.0-20240619.tgz.asc 729 BLAKE2B 35113c83dbd649ec67a4b3c97d769f98650f54 EBUILD cdk-5.0.20230201-r1.ebuild 1725 BLAKE2B 39a015fd64363bce92c78b8fba3d970a22fb2b0e6073360788256a2b72f545132db3fdc26ddd187733229eccbd6433928320c38f504d47054f674654d5678e2a SHA512 772d83bfe6ab00804ac4a8657b6203e87e50deb450826ae7480a0c00ec51acbfa4828bd0cdaf93ec0f87d07c96311430e55d4a7e0ef6e11096566c4b8699bdb6 EBUILD cdk-5.0.20230201.ebuild 1564 BLAKE2B 3e5930ba512c5ef9ae9be518690d6bca92e7c057a081e4e0135496b7de22b5cd2a191a6197b1385a9c880f11194ba55754f2a97df7c603f1cf447df0cd82cf93 SHA512 030dbd6e631a3775ff63c66c23fdcefc3f610d4cb053a44fc238ad1577ceed5e6588cf108e41f5e5d099fcba79573399c46b3678b1a189c480aac0393cb52a4e EBUILD cdk-5.0.20240331.ebuild 1720 BLAKE2B e4655a06287782e8b2558f37367dd152c6912aa68785a30e2b45913de1fc98431989316f50361db197696431441d387c3abdfeb91e3f82eb2b6d7d1d998894dc SHA512 0db71e27a5c8d491423de693f9ae6e8f97cd61c7f9d5d1f763c9654aa8acc7e63ca00cd714a401ef6671980ae0ec7d440496dc22a36a122731681842b070d035 -EBUILD cdk-5.0.20240619.ebuild 1817 BLAKE2B 041aa0643538b9a457fa4a9cf6f609ef23822296480a813f7ec593a5f6c69b30baa5fdb6b8571bb5ea139f2ff5961e5979e5b2401df1afcec763fb6299caa405 SHA512 50514a7db2113a9c61c5bd1093e278477aa2ccbe5e551d62ae8b27bb06902bc0bc2f8c69808b6375d67d6f71300617f978bf1c4248993cba9593c9c40b0d36e8 -MISC metadata.xml 324 BLAKE2B bf46126999ac5cdcd845a040fd4a3999ce2a068e55ef9bb51502318ae95b7fced58a315939649b7f33a7a40f2c4e47a4255c86fd4a4e141cd1513176e109fb2d SHA512 865d63909eea54c984081d7203b09d07439c2b91bf29eabe3d1fa9958fd82e38e19527aafd6ec4e8cfe844082178084b9f418820ccbd22e7c554c770b7d56b3a +EBUILD cdk-5.0.20240619-r1.ebuild 1875 BLAKE2B 9dde68e7373a207174854117036e1677b0597ddf84a5d3b85d26182f689278e2800cb31b0a6c7822c938160c80b16e7585ce3754e1d057424ea83c1c146bd908 SHA512 5936912b28c63d896513b7a2ac21f2306fc6288934003373c75e70ace2e5b98a1cecee52c3a53f27cc24aa561a7788e1cf0bac05b6bc1eaa93548341a1655866 +MISC metadata.xml 545 BLAKE2B 61ce8946a6f2c66cc863d342dfd00f7a82666ec1270354dfb7edb1881770faa134fa2b4e5063d6f22fbf22692589f13296ddaf86254b7edf0b81b978cc60dbe2 SHA512 fa99369795a9c8b07f76f47f599ce2988a66031028a7aa449753245a87f7184eb7a89f34fbe0a093d42af1dc32045ec8714d1d1f8b78bbb2909a057f8e495bc3 diff --git a/dev-libs/cdk/cdk-5.0.20240619-r1.ebuild b/dev-libs/cdk/cdk-5.0.20240619-r1.ebuild new file mode 100644 index 000000000000..b2fe41e7d07a --- /dev/null +++ b/dev-libs/cdk/cdk-5.0.20240619-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 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 ~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 ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.0.20240619-xlib.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 + # + # Fedora and openSUSE at least both build with --enable-const. Without + # this, consumers end up broken like gphoto2 in bug #919279. + econf \ + --disable-rpath-hack \ + --enable-const \ + --with-shared \ + --with-pkg-config \ + --enable-pc-files \ + --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \ + --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.20240619.ebuild b/dev-libs/cdk/cdk-5.0.20240619.ebuild deleted file mode 100644 index a490d9d8bb0e..000000000000 --- a/dev-libs/cdk/cdk-5.0.20240619.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2024 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 ~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 - # - # Fedora and openSUSE at least both build with --enable-const. Without - # this, consumers end up broken like gphoto2 in bug #919279. - econf \ - --disable-rpath-hack \ - --enable-const \ - --with-shared \ - --with-pkg-config \ - --enable-pc-files \ - --with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \ - --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.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 @@ - + + zhixu.liu@gmail.com + Z. Liu + + + proxy-maint@gentoo.org + Proxy Maintainers + https://dickey.his.com/cdk/CHANGES.html ThomasDickey/cdk-snapshots -- cgit v1.2.3