From 9f7759b3b1be5a3bc7794010a8ebf9334f017d2f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Nov 2022 06:52:13 +0000 Subject: gentoo auto-resync : 15:11:2022 - 06:52:13 --- app-misc/Manifest.gz | Bin 50057 -> 50061 bytes app-misc/wcd/Manifest | 3 + app-misc/wcd/files/wcd-6.0.4-gentoo.patch | 103 ++++++++++++++++++++++++++++++ app-misc/wcd/wcd-6.0.4.ebuild | 49 ++++++++++++++ 4 files changed, 155 insertions(+) create mode 100644 app-misc/wcd/files/wcd-6.0.4-gentoo.patch create mode 100644 app-misc/wcd/wcd-6.0.4.ebuild (limited to 'app-misc') diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz index c894d5548347..1d52f4ef7b9d 100644 Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest index 8b2d2bafe720..ef191cccb9c0 100644 --- a/app-misc/wcd/Manifest +++ b/app-misc/wcd/Manifest @@ -1,5 +1,8 @@ AUX wcd-6.0.2-gentoo.patch 1466 BLAKE2B 2e6834d2f8f742b1582667c0ee3b0ca974600dc26a1e270bb1ea7be39ac266c019c8464f61d332c2919a5543581c9b07000ef8bdcbece7684d1046b808af920a SHA512 33ed7d9812676b5cd478351fecc31e12dce29c8e4c5b28d44b3580ac01074b631906fcd0bcea0ad66a6fcb72ace3cf13004f492c96d8a5533af7c8500ea5e703 AUX wcd-6.0.3-doc-path.patch 480 BLAKE2B 75645e76a417f580f42411fe8a7f3155b1d9917edf5e03c6bd7111233b370f30c4c77213851435e7bd4b5417f94c7e414bf70d38caec6715d7d4ebc165c3a9ff SHA512 452aa5969438c8b929cceb35dd57148a9f2c2fe2014ead0524e6edb4dc20692f639a09ee68170fc2b6fd6e64b3406b5a4087aa020f223e53599ab1ebd408df4f +AUX wcd-6.0.4-gentoo.patch 2645 BLAKE2B a9ff626ec885a639e82d19af9849312054a5b2c83cc1d37e59a029b388eab0d015eace2b4f67e53b800e463ab40708f25bec4251cea4c2cb1ae617ecf97c88f5 SHA512 798b7fa40d594795c0324487106f369562eae1214de2d23876615fb35ca773c735cd652a347f786625b27650dd8b762007c73dcabbcef4023ec8dfb20ff6fbb4 DIST wcd-6.0.3.tar.gz 813763 BLAKE2B 2e215c427914705213590d7c5182bebf39becbf24238bd71c5fdd12f7e63894b2ad571793f6d25833edd3f7cd4f3acbb07bbc821880c22d7a5d4f373cd972055 SHA512 b48a6f8a196725b4b570701813cf8a96e13e4fd6289b6c779218acc20ea1ea841e5f8648f717bb389976b715b95856e91bad3ffb20f8d80961d75eae8eacfbe8 +DIST wcd-6.0.4.tar.gz 935815 BLAKE2B 00ec281890fe363258e0c847460ad9067f1c14409e64dfde239340ecf4f711af2047a8a1da226d4d17797e2b7452a4cd5aa65a0fcedcc2c172378d35a18a4a20 SHA512 afec27c0ca4cf7c7d24399f1f23c69ee765d57b449179696be5da82bcd6b146156254d9d1264e9c1f4905d5c117c7ac935a372aea25fa539b76c9bc866640daa EBUILD wcd-6.0.3-r2.ebuild 1016 BLAKE2B 643575b1e0a3593f40eae46ad2bbd1572658202dd0785d79e81c1c09fbbcd3f438fba3ae70c4067a7f167bc6f3df69e8687aac1e9485c0337bab5dbbb21b94e8 SHA512 829499dc8ac746423f0a959d498b5ab7a453bca5b792932c9ec4999b2e4eab393c9d5c583a75aa583a03fceafaae5897ad15f54ecae6f45a357996b7ad57482e +EBUILD wcd-6.0.4.ebuild 998 BLAKE2B c39df124399613b77514b83377d1f86d4752d2b62b2f0ca14071b858f6e23f1ad31d5fa782bdd74b7eab08b8be03bea83156b798efffb1390c120a3a35bae13f SHA512 07f8efe15c31d3aedb688fe58154f0663eef0b0493e51eff7b77f18f69562534104cf9a463120287708e14fb727a272ff2502779750a9e1c618baa843ffd2442 MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc diff --git a/app-misc/wcd/files/wcd-6.0.4-gentoo.patch b/app-misc/wcd/files/wcd-6.0.4-gentoo.patch new file mode 100644 index 000000000000..80fa5dc83ec4 --- /dev/null +++ b/app-misc/wcd/files/wcd-6.0.4-gentoo.patch @@ -0,0 +1,103 @@ +Patches build system. + +* Gentoo does not want pre-stripped files. +* We do not want .exe files as the output +* Gentoo packages curses, ncurses and ncursesw separately. + Therefore we need to get curses from pkg-config and include the correct path. + + +Bug: https://bugs.gentoo.org/878585 + +Signed-off-by: Pascal Jäger + +--- a/src/Makefile ++++ b/src/Makefile +@@ -45,12 +45,12 @@ + + CC ?= gcc + STATIC = +-STRIP = strip ++STRIP = + + ENABLE_NLS = 1 + + PACKAGE = wcd +-EXT = .exe ++EXT = + PROGRAM = $(PACKAGE)$(EXT) + BIN = $(PROGRAM) + +@@ -328,9 +328,9 @@ + # possible values: ncurses, curses, pdcurses, pdcursesw or + + ifdef UCS +- CURSES = ncursesw ++ CURSES = $(shell ${PKG_CONFIG} --libs ncursesw) + else +- CURSES = ncurses ++ CURSES = $(shell ${PKG_CONFIG} --libs ncurses) + endif + + +@@ -360,7 +360,7 @@ + + ifneq (,$(CURSES)) + DEFS_CURSES = -DWCD_USECURSES +- LIB_CURSES = -l$(CURSES) ++ LIB_CURSES = $(CURSES) + ifeq (os/2,$(OS)) + LIB_CURSES += -ltinfo + endif +@@ -458,15 +458,15 @@ + + LDFLAGS_USER = + LDFLAGS ?= +-LDFLAGS += $(RPM_LD_FLAGS) \ ++LIBS = $(RPM_LD_FLAGS) \ + $(LDFLAGS_EXTRA) \ + $(NLFLAG) \ + $(LDFLAG_STATIC) \ + $(LDFLAGS_USER) + +-LIBS = $(LIB_CURSES) \ +- $(LIB_UNISTRING) \ +- $(LIBS_EXTRA) ++LIBS += $(LIB_CURSES) \ ++ $(LIB_UNISTRING) \ ++ $(LIBS_EXTRA) + + DEFS_USER = + DEFS = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER) +@@ -523,7 +523,7 @@ + + $(BIN): $(OBJS1) + $(MAKE) status +- $(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@ ++ $(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS) + + %.o: %.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@ +diff --git a/src/Makefile b/src/Makefile +index fc317de..c5cff96 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -359,7 +359,7 @@ endif + endif + + ifneq (,$(CURSES)) +- DEFS_CURSES = -DWCD_USECURSES ++ DEFS_CURSES = -DWCD_USECURSES $(shell ${PKG_CONFIG} --cflags-only-other ncursesw) + LIB_CURSES = $(CURSES) + ifeq (os/2,$(OS)) + LIB_CURSES += -ltinfo +@@ -384,9 +384,7 @@ endif + # Each ncurses variant has its own include directory + # ncurses (normal)/ncursesw (wide char)/ncursest (threads) + ifeq ($(findstring ncurses,$(CURSES)),ncurses) +-ifneq ($(wildcard $(INCPREFIX)/include/$(CURSES)/curses.h),) +- INCFLAGS = -I$(INCPREFIX)/include/$(CURSES) -I$(INCPREFIX)/include +-endif ++ INCFLAGS = $(shell ${PKG_CONFIG} --cflags-only-I ncursesw) + ifeq ($(NCURSES_DEBUG), 1) + LIB_CURSES = -l$(CURSES)_g + endif diff --git a/app-misc/wcd/wcd-6.0.4.ebuild b/app-misc/wcd/wcd-6.0.4.ebuild new file mode 100644 index 000000000000..39d96c97f6f1 --- /dev/null +++ b/app-misc/wcd/wcd-6.0.4.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Wherever Change Directory" +HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR" +SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +IUSE="nls unicode" + +RDEPEND=" + sys-libs/ncurses:=[unicode(+)?] + unicode? ( dev-libs/libunistring:= )" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/ghostscript-gpl + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.0.4-gentoo.patch + "${FILESDIR}"/${PN}-6.0.3-doc-path.patch +) + +src_prepare() { + default + tc-export CC PKG_CONFIG +} + +src_compile() { + cd src || die + local mycompile="LFS=1" + use nls || mycompile+=" ENABLE_NLS=" + use unicode && mycompile+=" UCS=1 UNINORM=1" + emake ${mycompile} +} + +src_install() { + cd src || die + local DOCS=( ../README.txt ) + default + emake DESTDIR="${ED}" DOTWCD=1 install-profile sysconfdir="/etc" +} -- cgit v1.2.3