* [gentoo-commits] repo/gentoo:master commit in: app-misc/wcd/files/, app-misc/wcd/
@ 2021-04-19 19:15 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-04-19 19:15 UTC (permalink / raw
To: gentoo-commits
commit: 52871b9f96e255e40583307c506053dfcc4d6f30
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 19:14:54 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 19:15:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52871b9f
app-misc/wcd: drop 5.2.7, 5.3.4, 6.0.1
Closes: https://bugs.gentoo.org/783648
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-misc/wcd/Manifest | 3 --
app-misc/wcd/files/wcd-5.2.5-gentoo.patch | 67 -------------------------------
app-misc/wcd/files/wcd-5.3.4-gentoo.patch | 67 -------------------------------
app-misc/wcd/files/wcd-6.0.1-gentoo.patch | 67 -------------------------------
app-misc/wcd/wcd-5.2.7.ebuild | 46 ---------------------
app-misc/wcd/wcd-5.3.4.ebuild | 52 ------------------------
app-misc/wcd/wcd-6.0.1.ebuild | 46 ---------------------
7 files changed, 348 deletions(-)
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index 6757b5f0846..e0d3dcf326f 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,4 +1 @@
-DIST wcd-5.2.7.tar.gz 622613 BLAKE2B 85c473ad607022953338872a46251b2010504608d0385a17c6188e76975058af7370fbc393b0a9a1911b6c200f7397fcf45c4426aaa48f5a3f31a696657c444e SHA512 9f5b89d8160f685b729234cc8c03f16b795797dd6eaf2d9e1bbf1949b27ef971908b78642679d3bf1d99b128b390cd5dbd211e4ff03b0539dd287c578088e02e
-DIST wcd-5.3.4.tar.gz 610630 BLAKE2B f460de38b0ded0da592df31c12d8f28f890555750f972e395b5178665bdd2bf0514b258f5c2c1338e6a7699224c04153e67d088642626b5611abb9b685d305fd SHA512 fdb6e000876fffbc7bce6e6157282c2b8ef9929c896e5dbd8533314d575cf31656df76cd5c408bb2e495a1fda7f179b122ea2a58da94d5d55d1e2b9c658adc94
-DIST wcd-6.0.1.tar.gz 705577 BLAKE2B 9af2c14bae8cce50ad69b230897f2ae18c6ce899e9ed5d2f9b014ffb5b104c9fd136aa0d8a14110ae08fb1b9d4cc5f7819f42f5f23f5adf34780d16adf801790 SHA512 7a1a97b1dee220f2a425fcd7669ee9a3ca144992fe18444866269499b10bdea1671a5fca13eaa77c12c807d901e7831701e00a35c766021533a922b84b68247e
DIST wcd-6.0.2.tar.gz 713062 BLAKE2B 13a745fd698b009aedb19e688a5deec7d62c42acf2dc430b7f586f300712ad684e8530a9b2477cf2d7a6540769efc98c245215cbe756b78c3902d03430b034d9 SHA512 587a52efaf0a585e4fc8a04a0eb08445cf4c78d38abd7592658f61827aa6cc0f1e8af8643c411d22d74145479c9970b018b11fc7a2a08b4ba7c850097813b06f
diff --git a/app-misc/wcd/files/wcd-5.2.5-gentoo.patch b/app-misc/wcd/files/wcd-5.2.5-gentoo.patch
deleted file mode 100644
index 82a1594399b..00000000000
--- a/app-misc/wcd/files/wcd-5.2.5-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -46,12 +46,12 @@ include version.mk
-
- CC ?= gcc
- STATIC =
--STRIP = strip
-+STRIP =
-
- ENABLE_NLS = 1
-
- PACKAGE = wcd
--EXT = .exe
-+EXT =
- PROGRAM = $(PACKAGE)$(EXT)
- BIN = $(PROGRAM)
-
-@@ -188,9 +188,9 @@ endif
- # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
-
- ifdef UCS
-- CURSES = ncursesw
-+ CURSES = $(shell ${PKG_CONFIG} --libs ncursesw)
- else
-- CURSES = ncurses
-+ CURSES = $(shell ${PKG_CONFIG} --libs ncurses)
- endif
-
- ifdef CURSES
-@@ -201,7 +201,7 @@ endif
-
- ifneq (,$(CURSES))
- DEFS_CURSES = -DWCD_USECURSES
-- LIB_CURSES = -l$(CURSES)
-+ LIB_CURSES = $(CURSES)
- endif
-
-
-@@ -406,15 +406,15 @@ ifdef ASCII_TREE
- endif
-
- LDFLAGS_USER =
--LDFLAGS = $(RPM_OPT_FLAGS) \
-+LIBS = $(RPM_OPT_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)
-@@ -470,7 +470,7 @@ status:
-
- $(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/app-misc/wcd/files/wcd-5.3.4-gentoo.patch b/app-misc/wcd/files/wcd-5.3.4-gentoo.patch
deleted file mode 100644
index aa164ce9b14..00000000000
--- a/app-misc/wcd/files/wcd-5.3.4-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -46,12 +46,12 @@
-
- CC ?= gcc
- STATIC =
--STRIP = strip
-+STRIP =
-
- ENABLE_NLS = 1
-
- PACKAGE = wcd
--EXT = .exe
-+EXT =
- PROGRAM = $(PACKAGE)$(EXT)
- BIN = $(PROGRAM)
-
-@@ -334,9 +334,9 @@
- # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
-
- ifdef UCS
-- CURSES = ncursesw
-+ CURSES = $(shell ${PKG_CONFIG} --libs ncursesw)
- else
-- CURSES = ncurses
-+ CURSES = $(shell ${PKG_CONFIG} --libs ncurses)
- endif
-
-
-@@ -366,7 +366,7 @@
-
- ifneq (,$(CURSES))
- DEFS_CURSES = -DWCD_USECURSES
-- LIB_CURSES = -l$(CURSES)
-+ LIB_CURSES = $(CURSES)
- ifeq (os/2,$(OS))
- LIB_CURSES += -ltinfo
- endif
-@@ -456,15 +456,15 @@
- endif
-
- LDFLAGS_USER =
--LDFLAGS = $(RPM_OPT_FLAGS) \
-+LIBS = $(RPM_OPT_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)
-@@ -521,7 +521,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/app-misc/wcd/files/wcd-6.0.1-gentoo.patch b/app-misc/wcd/files/wcd-6.0.1-gentoo.patch
deleted file mode 100644
index 420f5d4cec3..00000000000
--- a/app-misc/wcd/files/wcd-6.0.1-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- 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)
-
-@@ -329,9 +329,9 @@
- # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
-
- ifdef UCS
-- CURSES = ncursesw
-+ CURSES = $(shell ${PKG_CONFIG} --libs ncursesw)
- else
-- CURSES = ncurses
-+ CURSES = $(shell ${PKG_CONFIG} --libs ncurses)
- endif
-
-
-@@ -361,7 +361,7 @@
-
- ifneq (,$(CURSES))
- DEFS_CURSES = -DWCD_USECURSES
-- LIB_CURSES = -l$(CURSES)
-+ LIB_CURSES = $(CURSES)
- ifeq (os/2,$(OS))
- LIB_CURSES += -ltinfo
- endif
-@@ -455,15 +455,15 @@
- endif
-
- LDFLAGS_USER =
--LDFLAGS = $(RPM_OPT_FLAGS) \
-+LIBS = $(RPM_OPT_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)
-@@ -520,7 +520,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/app-misc/wcd/wcd-5.2.7.ebuild b/app-misc/wcd/wcd-5.2.7.ebuild
deleted file mode 100644
index e6275be727d..00000000000
--- a/app-misc/wcd/wcd-5.2.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch 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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-IUSE="nls unicode"
-
-CDEPEND="
- sys-libs/ncurses[unicode?]
- unicode? ( dev-libs/libunistring )"
-DEPEND="${CDEPEND}
- app-text/ghostscript-gpl
- virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"/${P}/src
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-5.2.5-gentoo.patch
- tc-export CC PKG_CONFIG
-}
-
-src_compile() {
- local mycompile="LFS=1"
- use nls || mycompile="${mycompile} ENABLE_NLS="
- use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
- emake \
- ${mycompile}
-}
-
-src_install() {
- local DOCS="../README.txt"
- default
- emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
-}
diff --git a/app-misc/wcd/wcd-5.3.4.ebuild b/app-misc/wcd/wcd-5.3.4.ebuild
deleted file mode 100644
index b6b5ada63e4..00000000000
--- a/app-misc/wcd/wcd-5.3.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls unicode"
-
-CDEPEND="
- sys-libs/ncurses:0=[unicode?]
- unicode? ( dev-libs/libunistring )"
-DEPEND="${CDEPEND}
- app-text/ghostscript-gpl
- virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"/${P}/src
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.3.4-gentoo.patch
-)
-
-src_prepare() {
- # Required for stupid eapply function
- pushd .. &>/dev/null || die
- default
- popd &>/dev/null || die
- tc-export CC PKG_CONFIG
-}
-
-src_compile() {
- local mycompile="LFS=1"
- use nls || mycompile="${mycompile} ENABLE_NLS="
- use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
- emake \
- ${mycompile}
-}
-
-src_install() {
- local DOCS=( ../README.txt )
- default
- emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
-}
diff --git a/app-misc/wcd/wcd-6.0.1.ebuild b/app-misc/wcd/wcd-6.0.1.ebuild
deleted file mode 100644
index 3aca5740d54..00000000000
--- a/app-misc/wcd/wcd-6.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls unicode"
-
-CDEPEND="
- sys-libs/ncurses:0=[unicode?]
- unicode? ( dev-libs/libunistring )"
-DEPEND="${CDEPEND}
- app-text/ghostscript-gpl
- virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
- eapply -p2 "${FILESDIR}"/${PN}-6.0.1-gentoo.patch
- eapply_user
- tc-export CC PKG_CONFIG
-}
-
-src_compile() {
- local mycompile="LFS=1"
- use nls || mycompile="${mycompile} ENABLE_NLS="
- use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
- emake \
- ${mycompile}
-}
-
-src_install() {
- local DOCS=( ../README.txt )
- default
- emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/wcd/files/, app-misc/wcd/
@ 2023-09-02 13:32 Arthur Zamarin
0 siblings, 0 replies; 4+ messages in thread
From: Arthur Zamarin @ 2023-09-02 13:32 UTC (permalink / raw
To: gentoo-commits
commit: 3026d476bbc4f1add97ef2e3a1d849dac4ff759c
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Fri Sep 1 13:50:58 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 13:32:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3026d476
app-misc/wcd: add 6.0.5
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/32550
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-misc/wcd/Manifest | 1 +
app-misc/wcd/files/wcd-6.0.3-doc-path.patch | 7 +++--
app-misc/wcd/files/wcd-6.0.4-gentoo.patch | 2 --
app-misc/wcd/metadata.xml | 5 +++
app-misc/wcd/wcd-6.0.5.ebuild | 49 +++++++++++++++++++++++++++++
5 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index b3fbcd9285ec..7e94b7947904 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1 +1,2 @@
DIST wcd-6.0.4.tar.gz 935815 BLAKE2B 00ec281890fe363258e0c847460ad9067f1c14409e64dfde239340ecf4f711af2047a8a1da226d4d17797e2b7452a4cd5aa65a0fcedcc2c172378d35a18a4a20 SHA512 afec27c0ca4cf7c7d24399f1f23c69ee765d57b449179696be5da82bcd6b146156254d9d1264e9c1f4905d5c117c7ac935a372aea25fa539b76c9bc866640daa
+DIST wcd-6.0.5.tar.gz 1130436 BLAKE2B 65ba203f42ada8657ca11ec15a3a76d31523b0dc388415fbbc58e710e2ffec5b96f85d962ddcdb07b7749395223c64e367402106aa7d5a8910f63d09ffac004c SHA512 ac3fc0690e2011ab3a6863f075859a53887a7826b456f35b13421f8c3ed23e0a4665d9641163a2142ffae18b26379b2dbefab75a124c556bd0103522aaeb3d13
diff --git a/app-misc/wcd/files/wcd-6.0.3-doc-path.patch b/app-misc/wcd/files/wcd-6.0.3-doc-path.patch
index 16e850a8baac..7fc8bf310ecc 100644
--- a/app-misc/wcd/files/wcd-6.0.3-doc-path.patch
+++ b/app-misc/wcd/files/wcd-6.0.3-doc-path.patch
@@ -1,8 +1,9 @@
Install docs into /usr/share/doc/wcd-${PVR}.
-diff -Nuar a/src/Makefile b/src/Makefile
---- a/src/Makefile 2019-08-14 10:07:15.000000000 +0000
-+++ b/src/Makefile 2021-10-23 17:10:17.000000000 +0000
+Bug: https://bugs.gentoo.org/802696
+
+--- a/src/Makefile
++++ b/src/Makefile
@@ -61,7 +61,7 @@
datarootdir = $(prefix)/share
datadir = $(datarootdir)
diff --git a/app-misc/wcd/files/wcd-6.0.4-gentoo.patch b/app-misc/wcd/files/wcd-6.0.4-gentoo.patch
index 80fa5dc83ec4..4a465e16b9c8 100644
--- a/app-misc/wcd/files/wcd-6.0.4-gentoo.patch
+++ b/app-misc/wcd/files/wcd-6.0.4-gentoo.patch
@@ -77,8 +77,6 @@ Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
%.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
diff --git a/app-misc/wcd/metadata.xml b/app-misc/wcd/metadata.xml
index df1ea8d84522..bd65558b9507 100644
--- a/app-misc/wcd/metadata.xml
+++ b/app-misc/wcd/metadata.xml
@@ -5,4 +5,9 @@
<email>shell-tools@gentoo.org</email>
<name>Gentoo Shell Tools Project</name>
</maintainer>
+ <upstream>
+ <remote-id type="sourceforge">wcd</remote-id>
+ <bugs-to>https://sourceforge.net/p/wcd/bugs/</bugs-to>
+ <changelog>https://waterlan.home.xs4all.nl/wcd/doc/whatsnew.txt</changelog>
+ </upstream>
</pkgmetadata>
diff --git a/app-misc/wcd/wcd-6.0.5.ebuild b/app-misc/wcd/wcd-6.0.5.ebuild
new file mode 100644
index 000000000000..5ccc91c1fbb2
--- /dev/null
+++ b/app-misc/wcd/wcd-6.0.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Wherever Change Directory"
+HOMEPAGE="https://waterlan.home.xs4all.nl/wcd.html"
+SRC_URI="https://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= UNINORM="
+ emake ${mycompile}
+}
+
+src_install() {
+ cd src || die
+ local DOCS=( ../README.txt )
+ default
+ emake DESTDIR="${ED}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/wcd/files/, app-misc/wcd/
@ 2021-10-24 3:21 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-10-24 3:21 UTC (permalink / raw
To: gentoo-commits
commit: 784d85246bab32bfd9491dd8e281f7f9c6100395
Author: Matthew White <mehw.is.me <AT> inventati <DOT> org>
AuthorDate: Sat Oct 23 17:29:44 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 03:21:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=784d8524
app-misc/wcd: fix docs installed into unexpected path
Install docs into /usr/share/doc/wcd-${PVR}.
Closes: https://bugs.gentoo.org/802696
Package-Manager: Portage-3.0.20-r6, Repoman-3.0.3-r1
Signed-off-by: Matteo Bianco <mehw.is.me <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/22685
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-misc/wcd/files/wcd-6.0.3-doc-path.patch | 14 +++++++++
app-misc/wcd/wcd-6.0.3-r2.ebuild | 47 +++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/app-misc/wcd/files/wcd-6.0.3-doc-path.patch b/app-misc/wcd/files/wcd-6.0.3-doc-path.patch
new file mode 100644
index 00000000000..16e850a8baa
--- /dev/null
+++ b/app-misc/wcd/files/wcd-6.0.3-doc-path.patch
@@ -0,0 +1,14 @@
+Install docs into /usr/share/doc/wcd-${PVR}.
+
+diff -Nuar a/src/Makefile b/src/Makefile
+--- a/src/Makefile 2019-08-14 10:07:15.000000000 +0000
++++ b/src/Makefile 2021-10-23 17:10:17.000000000 +0000
+@@ -61,7 +61,7 @@
+ datarootdir = $(prefix)/share
+ datadir = $(datarootdir)
+
+-docsubdir = $(PACKAGE)-$(VERSION)
++docsubdir = $(PACKAGE)-$(PVR)
+ docdir = $(datarootdir)/doc/$(docsubdir)
+ localedir = $(datarootdir)/locale
+ sysconfdir = /etc
diff --git a/app-misc/wcd/wcd-6.0.3-r2.ebuild b/app-misc/wcd/wcd-6.0.3-r2.ebuild
new file mode 100644
index 00000000000..7c052415034
--- /dev/null
+++ b/app-misc/wcd/wcd-6.0.3-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+CDEPEND="
+ sys-libs/ncurses:=[unicode(+)?]
+ unicode? ( dev-libs/libunistring:= )"
+DEPEND="${CDEPEND}"
+BDEPEND="
+ app-text/ghostscript-gpl
+ virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+ eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
+ eapply -p2 "${FILESDIR}"/${P}-doc-path.patch
+ eapply_user
+ tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+ local mycompile="LFS=1"
+ use nls || mycompile+=" ENABLE_NLS="
+ use unicode && mycompile+=" UCS=1 UNINORM=1"
+ emake ${mycompile}
+}
+
+src_install() {
+ local DOCS=( ../README.txt )
+ default
+ emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/wcd/files/, app-misc/wcd/
@ 2018-05-11 15:49 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2018-05-11 15:49 UTC (permalink / raw
To: gentoo-commits
commit: f820eff8bf92cdc55898df2dfb3d83d2aae2568d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May 11 15:48:56 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May 11 15:48:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f820eff8
app-misc/wcd: Bump to version 6.0.2
Package-Manager: Portage-2.3.36, Repoman-2.3.9
app-misc/wcd/Manifest | 1 +
app-misc/wcd/files/wcd-6.0.2-gentoo.patch | 67 +++++++++++++++++++++++++++++++
app-misc/wcd/wcd-6.0.2.ebuild | 43 ++++++++++++++++++++
3 files changed, 111 insertions(+)
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index 7829e18eca3..9b7caadcc21 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -2,3 +2,4 @@ DIST wcd-5.2.7.tar.gz 622613 BLAKE2B 85c473ad607022953338872a46251b2010504608d03
DIST wcd-5.3.4.tar.gz 610630 BLAKE2B f460de38b0ded0da592df31c12d8f28f890555750f972e395b5178665bdd2bf0514b258f5c2c1338e6a7699224c04153e67d088642626b5611abb9b685d305fd SHA512 fdb6e000876fffbc7bce6e6157282c2b8ef9929c896e5dbd8533314d575cf31656df76cd5c408bb2e495a1fda7f179b122ea2a58da94d5d55d1e2b9c658adc94
DIST wcd-6.0.0.tar.gz 615838 BLAKE2B d4ccb766736ed6c63339089ff2303f63530a769ce76e400b50b10203e297a4471dea3b2693bb6482ce67ceadbc4e4efacbe13cef0f313c45c94a05d7c2e94586 SHA512 965a6e52324605e6de5bb26ee0abc927a5e06a9f843ce1c4b65359b52418973bf84278c2f5f24fabbfa7342f40f79f4648d616df9a6ce0e9eca5c108ee49f50d
DIST wcd-6.0.1.tar.gz 705577 BLAKE2B 9af2c14bae8cce50ad69b230897f2ae18c6ce899e9ed5d2f9b014ffb5b104c9fd136aa0d8a14110ae08fb1b9d4cc5f7819f42f5f23f5adf34780d16adf801790 SHA512 7a1a97b1dee220f2a425fcd7669ee9a3ca144992fe18444866269499b10bdea1671a5fca13eaa77c12c807d901e7831701e00a35c766021533a922b84b68247e
+DIST wcd-6.0.2.tar.gz 713062 BLAKE2B 13a745fd698b009aedb19e688a5deec7d62c42acf2dc430b7f586f300712ad684e8530a9b2477cf2d7a6540769efc98c245215cbe756b78c3902d03430b034d9 SHA512 587a52efaf0a585e4fc8a04a0eb08445cf4c78d38abd7592658f61827aa6cc0f1e8af8643c411d22d74145479c9970b018b11fc7a2a08b4ba7c850097813b06f
diff --git a/app-misc/wcd/files/wcd-6.0.2-gentoo.patch b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
new file mode 100644
index 00000000000..ecd7c530f15
--- /dev/null
+++ b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
@@ -0,0 +1,67 @@
+--- wcd-6.0.2/src/Makefile
++++ wcd-6.0.2/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 <empty>
+
+ 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/app-misc/wcd/wcd-6.0.2.ebuild b/app-misc/wcd/wcd-6.0.2.ebuild
new file mode 100644
index 00000000000..a5b1dabb2ee
--- /dev/null
+++ b/app-misc/wcd/wcd-6.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils 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"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls unicode"
+
+CDEPEND="
+ sys-libs/ncurses:0=[unicode?]
+ unicode? ( dev-libs/libunistring )"
+DEPEND="${CDEPEND}
+ app-text/ghostscript-gpl"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+ eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
+ eapply_user
+ tc-export CC
+}
+
+src_compile() {
+ local mycompile="LFS=1"
+ use nls || mycompile+=" ENABLE_NLS="
+ use unicode && mycompile+=" UCS=1 UNINORM=1"
+ emake ${mycompile}
+}
+
+src_install() {
+ local DOCS=( ../README.txt )
+ default
+ emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-02 13:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-19 19:15 [gentoo-commits] repo/gentoo:master commit in: app-misc/wcd/files/, app-misc/wcd/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-09-02 13:32 Arthur Zamarin
2021-10-24 3:21 Sam James
2018-05-11 15:49 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox