From 2eda3a3b8ebdb3fc8552feb6f49e466d3bc8e88c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 20 Oct 2022 07:59:50 +0100 Subject: gentoo auto-resync : 20:10:2022 - 07:59:49 --- app-misc/cw/Manifest | 4 +- app-misc/cw/cw-1.0.16-r4.ebuild | 75 -------------------- app-misc/cw/cw-1.0.16-r5.ebuild | 80 ++++++++++++++++++++++ app-misc/cw/files/cw-1.0.16-Respect-CPPFLAGS.patch | 21 ++++++ ...-1.0.16-fix-configure-for-newer-autotools.patch | 10 +++ 5 files changed, 114 insertions(+), 76 deletions(-) delete mode 100644 app-misc/cw/cw-1.0.16-r4.ebuild create mode 100644 app-misc/cw/cw-1.0.16-r5.ebuild create mode 100644 app-misc/cw/files/cw-1.0.16-Respect-CPPFLAGS.patch create mode 100644 app-misc/cw/files/cw-1.0.16-fix-configure-for-newer-autotools.patch (limited to 'app-misc/cw') diff --git a/app-misc/cw/Manifest b/app-misc/cw/Manifest index aa4893e5669d..b43097061e94 100644 --- a/app-misc/cw/Manifest +++ b/app-misc/cw/Manifest @@ -2,8 +2,10 @@ AUX 1.0.16-collision.patch 1239 BLAKE2B 39567192acb63116de0c9ae34eeb05619cf25d86 AUX 1.0.16-format-security.patch 284 BLAKE2B 79945a54bf591e7b78475276b1f51e5c613f9992580de92fa7ebed90201b955fdf4b151283e5f3ae84174233598b9f0687bf48b60f91f02b76e2518dec4b8492 SHA512 0f6b701e0d7925dcc5ec125db4efcd967fc17d5d1e4d3b5b73786639d0c017c9125c800d948843f4746c2762a0f7bf35eab183e9edb2a2f1088aa01f59021ec5 AUX 1.0.16-ldflags.patch 417 BLAKE2B ec4399063c9b082ea2b51cc33ba684f5b583392e350cc859e5b133fe324dff83c9d7efd3e0bd26b19534d760271b367088d05660c036eb58f870411b7ca4c0c7 SHA512 190d5fe9e583a5db62bb34ff228ee77e1f8bbb89c41943759d007f73571bb739ace842e7eda36b6eb50a63b212f8a73a4552a51e035f50aa4c9ab3414bccab4a AUX 1.0.16-path.patch 479 BLAKE2B 17108f1ff61d1ff3e4625f86589b6cc372cef6e849851df193093bef8f9fd43706f70eaec98544c3a2e4da20298b21c597d87dc56354e6317859f05b12bc9c38 SHA512 6ecc5cc11e65db11617b1ba902a414900e7e4f0ac319c60e4d5131769560b07a1dac3496b33dd07d44cf9ea6d95924114fb9361ef7b15235604a53b2b517bb53 +AUX cw-1.0.16-Respect-CPPFLAGS.patch 649 BLAKE2B c08bef1d8f6adf4b1a84b58c697bb1858d45b4fe619dcd67b5e13068f27e07c37b90c6d26826b3ed3dcb13010c6fd50f2cbaad0554768172d1f4bc99656cc77a SHA512 c3e52cab72c149f5b319e3cff5d9ab8f3fb9a575e6f1ec9fa99a07e5105a86f39ed524715afe6ced8483fa1f562bec0431073b74b1e4f9070ae5146b21f9bfbb +AUX cw-1.0.16-fix-configure-for-newer-autotools.patch 491 BLAKE2B 109ea5f7777205c87f6f52abb75fa0870d46a66b4ef869ac6cbc12eef1852afb3136cff4f8a8e9eef348e525fca4571aef85b398c6d1ed94c802798e48e4e092 SHA512 704dd7899d6316d2ae1ad478235370943f1bb42cc75a594e2eba36758afa2b81e0f3fff78445e03140de8ff7b41ba1f8a7fa81fbe9ea67df510838b7dc778125 AUX cw-1.0.16-replace-isastream-with-fcntl.patch 530 BLAKE2B 31719713817c810c4368b1842186711b1f9190d62eaa644bfe3981aa31a7733ccb4f85d0a3b5bfbfdfdca6357455cdb3fe030b4fa1be6c1cc85cc07c0190683e SHA512 3de7d966cbf1ccc86dd45a797c62af75b0e38e9f9e08547090d3eef6b947386b4bc1118e3f9bc5213e9c8d35e5f59e0e86b59823dd3883fd15eecc505c3b160d DIST cw-1.0.16.tar.bz2 76035 BLAKE2B 4257dad6df2122efabd9d5f51e7d0f0f5103afa261b4d7781ec27a81d9efc903c55a56e7b9bb1d16bb3c6bc856f15ec6f8d7ae69935511659bbfe82475377e38 SHA512 6a5da4e4dbb4d042d8b4e1e0727039f3103f9d7124a6f7c37ac094d7fee0ae10d9bacc6739fc133ca9fb682501bcafecd39a660abfe19fbf1fd9bf7ec06cfa32 EBUILD cw-1.0.16-r3.ebuild 1536 BLAKE2B 48af35f48ed2693c7ce6307dc7eb1f178d5d039a4a34abb6811943be3a8cd31392ddf5ff847097a3b1f14ffbb35acb8107ecf06cf246774c1449d94ff2b87263 SHA512 c537ae708fb5ab3439edb76b525f8dfa8c406ddc3e2777c3c2b1a84b605dee34a0a513d1f2bfe4d48e2582b5f94eb533cfa44f263a517e2a256e5e704455cc13 -EBUILD cw-1.0.16-r4.ebuild 1732 BLAKE2B 455ab021e2ce47a8c44bf7d30a0f586bd475b9a3701e43ff649d9561c03fa2a33f4cb38f25a6fc44c453ce82c2447e00663cc5ccea837a2a3f6c9f85ef8fbe9f SHA512 340869ae66627e4fd7396baae7641ef4866b0662db1ce2dcbbf8be61a563affab78659496bc2d639a1d3f452a1cf1fb7b77b3e637460ae9857a74b06eb809b70 +EBUILD cw-1.0.16-r5.ebuild 1864 BLAKE2B d037baa97a81af44568089df631b4195570dedc38e7a3e301cc257cee0b03608edd106aebd9dcb42baaa72fc65b32d1bf8c3e1459acc81f87cb991beab4e4d87 SHA512 1ef661bd4e0c47eaf3ce674cec2b65aab54f1f165a124d675dacbac5bbaa43b43550b341ca03e9e6fdb697bcf4a915489a4f2c2ea1b979d54c9db4784f032a90 MISC metadata.xml 344 BLAKE2B 7f3db60367ffaacb5217d36eee3a431fac236d8675ceb212641e7c391cd1e766302adef0912dd32c42b39df01b5747821af4dc36c11f3a79e0b4c7c57fa98bd8 SHA512 4b14684bfd5872f9de5812015c341c763da06a2e75981f67355464f68ea5f11dfa944233b1a77be73854dce0f697edcc76402ec1cd073d53d23db0ef2d6b565f diff --git a/app-misc/cw/cw-1.0.16-r4.ebuild b/app-misc/cw/cw-1.0.16-r4.ebuild deleted file mode 100644 index b738753f2715..000000000000 --- a/app-misc/cw/cw-1.0.16-r4.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands" -HOMEPAGE="http://cwrapper.sourceforge.net" -SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( - "${FILESDIR}"/${PV}-ldflags.patch - "${FILESDIR}"/${PV}-path.patch - "${FILESDIR}"/${PV}-collision.patch - "${FILESDIR}"/${PV}-format-security.patch - "${FILESDIR}"/${P}-replace-isastream-with-fcntl.patch -) - -src_unpack() { - default - - gunzip "${S}"/man/*.gz || die -} - -src_configure() { - tc-export CC - - append-flags -D_XOPEN_SOURCE=500 -D_GNU_SOURCE - - econf -} - -src_compile() { - emake local -} - -src_install() { - insinto /usr/share/cw - doins etc/* - - exeinto /usr/libexec/cw - doexe def/* - - doman man/cwu.1 - doman man/cwe.1 - newman man/cw.1 color-wrapper - dodoc CHANGES CONTRIB INSTALL README PLATFORM doc/README* - - dobin bin/{cwu,colorcfg} - # app-misc/color currently conflicts; hopefully 'colors' is safe - newbin bin/color colors - # media-radio/unixcw currently conflicts; - newbin bin/cw color-wrapper -} - -pkg_postinst() { - ebegin "Updating definition files" - cwu /usr/libexec/cw /usr/bin/color-wrapper # >/dev/null - eend $? - - elog "To enable color-wrapper, as your user, run:" - elog " colorcfg [1|2|3]" - elog "to add relevant environment variables to your ~/.bash_profile" - elog "Run colorcfg without options to see what [1|2|3] means." - elog - elog "After sourcing your ~/.bash_profile, commands for which definitions" - elog "are provided should have colored output." - elog - elog "To enable/disable colored output, run: 'colors [on|off]'." -} diff --git a/app-misc/cw/cw-1.0.16-r5.ebuild b/app-misc/cw/cw-1.0.16-r5.ebuild new file mode 100644 index 000000000000..055fddd637fe --- /dev/null +++ b/app-misc/cw/cw-1.0.16-r5.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WANT_AUTOMAKE="none" +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="A non-intrusive real-time ANSI color wrapper for common unix-based commands" +HOMEPAGE="http://cwrapper.sourceforge.net" +SRC_URI="mirror://sourceforge/cwrapper/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +PATCHES=( + "${FILESDIR}"/${PV}-ldflags.patch + "${FILESDIR}"/${PV}-path.patch + "${FILESDIR}"/${PV}-collision.patch + "${FILESDIR}"/${PV}-format-security.patch + "${FILESDIR}"/${P}-replace-isastream-with-fcntl.patch + "${FILESDIR}"/${P}-fix-configure-for-newer-autotools.patch + "${FILESDIR}"/${P}-Respect-CPPFLAGS.patch +) + +src_prepare() { + default + + gunzip "${S}"/man/*.gz || die + + eautoreconf +} + +src_configure() { + tc-export CC + + append-cppflags -D_GNU_SOURCE + + econf +} + +src_compile() { + emake local +} + +src_install() { + insinto /usr/share/cw + doins etc/* + + exeinto /usr/libexec/cw + doexe def/* + + doman man/cwu.1 + doman man/cwe.1 + newman man/cw.1 color-wrapper + dodoc CHANGES CONTRIB INSTALL README PLATFORM doc/README* + + dobin bin/{cwu,colorcfg} + # app-misc/color currently conflicts; hopefully 'colors' is safe + newbin bin/color colors + # media-radio/unixcw currently conflicts; + newbin bin/cw color-wrapper +} + +pkg_postinst() { + ebegin "Updating definition files" + cwu /usr/libexec/cw /usr/bin/color-wrapper # >/dev/null + eend $? + + elog "To enable color-wrapper, as your user, run:" + elog " colorcfg [1|2|3]" + elog "to add relevant environment variables to your ~/.bash_profile" + elog "Run colorcfg without options to see what [1|2|3] means." + elog + elog "After sourcing your ~/.bash_profile, commands for which definitions" + elog "are provided should have colored output." + elog + elog "To enable/disable colored output, run: 'colors [on|off]'." +} diff --git a/app-misc/cw/files/cw-1.0.16-Respect-CPPFLAGS.patch b/app-misc/cw/files/cw-1.0.16-Respect-CPPFLAGS.patch new file mode 100644 index 000000000000..b1ae96daf4a4 --- /dev/null +++ b/app-misc/cw/files/cw-1.0.16-Respect-CPPFLAGS.patch @@ -0,0 +1,21 @@ +From 64249a5b7e2aaa4b53e41deb767a164cf5b68421 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Thu, 20 Oct 2022 04:48:48 +0100 +Subject: [PATCH] Respect CPPFLAGS + +--- a/Makefile.in ++++ b/Makefile.in +@@ -19,11 +19,11 @@ all: + + cw: + @$(ECHO) "* Compiling cw(color wrapper)..." +- $(CC) $(CFLAGS) $(LDFLAGS) src/cw.c -o bin/cw @CFLAGS@ @LIBS@ @DEFS@ ++ $(CC) $(CPPFLAGS) @DEFS@ $(CFLAGS) @CFLAGS@ $(LDFLAGS) src/cw.c -o bin/cw @LIBS@ + + cwu: + @$(ECHO) "* Compiling cwu(color wrapper directive updater)..." +- $(CC) $(CFLAGS) $(LDFLAGS) src/cwu.c -o bin/cwu ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/cwu.c -o bin/cwu + + local: cw cwu + diff --git a/app-misc/cw/files/cw-1.0.16-fix-configure-for-newer-autotools.patch b/app-misc/cw/files/cw-1.0.16-fix-configure-for-newer-autotools.patch new file mode 100644 index 000000000000..038e30074371 --- /dev/null +++ b/app-misc/cw/files/cw-1.0.16-fix-configure-for-newer-autotools.patch @@ -0,0 +1,10 @@ +--- a/configure.in ++++ b/configure.in +@@ -17,7 +17,6 @@ ORIG_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wall" + AC_TRY_COMPILE(,[return 0;],AC_MSG_RESULT(yes),AC_MSG_RESULT(no);CFLAGS="$ORIG_CFLAGS") + AC_CONFIG_HEADER(config.h) +-AC_REQUIRE([AC_HEADER_STDC]) + AC_CHECK_LIB(util, openpty) + AC_CHECK_FILE("/dev/ptmx", AC_DEFINE(HAVE_DEV_PTMX, 1, Have /dev/ptmx.)) + AC_CHECK_FUNCS(getpt isatty isxdigit openpty putenv regcomp setenv setproctitle setsid sigaction sscanf uname unsetenv vsnprintf waitpid) -- cgit v1.2.3