gentoo auto-resync : 02:09:2023 - 16:16:36

8 files changed, 63 insertions, 77 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 580d705ca6c9..0085d99ee2b9 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 66023eced445..b33ead30da85 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,6 +1,4 @@
 AUX golly-4.0-CFLAGS.patch 686 BLAKE2B 1d82b951bee9f336931ad2589bae03bd8e52ac2f982294f18abd5297bc0d5cbd877ece2716736ce8dfcf044c823cb707d6ce8923177b3ab2bbf09a3d0e247b92 SHA512 b883702ed44bd8469255bbc43191bbf91da64ff0048d4cc3c7cc0c5103e01fe49f9017ad1723d041ab080dfa46b68f4bab0b9abd850b74b1803d5bcebb04c36a
-DIST golly-4.1-src.tar.gz 14877727 BLAKE2B d9cac1250901a39d6a360b527c6f4872fc78d0426ea255b9f9129136b938a6655ff59f8c5b0204fd44f4ac0ae76e307c763ddb24a1d8a00bd4e548e4ac2277c3 SHA512 bc050a216a36091f0df42e61a19c34353c6306dc1ae86c194693c85a4489b118435da238b25017bde4b3d31a79e12a6988f7b7da5ae90cfcc9ca0795e66d4a99
 DIST golly-4.2-src.tar.gz 15348982 BLAKE2B 21ebed4c282a77a3f61aafa98936c0bb39b39a7c97505e96fc43ac720bd2eea4cf20996ca28c801f79a46577a0cf99ff60614ce134081605d14ca5972c841d50 SHA512 b9f5cfdfe9b96590411695805dd8b875329c81027fef98dff3f16b832018be2ad3a06583bb64e12fb305268feba2347ef63c4586ff0e645721a8085f04ab382a
-EBUILD golly-4.1-r1.ebuild 1411 BLAKE2B f5100628ebec553b0bb7c87f90d002216be68a758101c7336e378910f357494be97a73a67b0a027fc83efe2bfc0f3065dc1a26dfba935746a32f0b77f61b9057 SHA512 b90e1f02ed3d59e107ee412adc88ad3603c9083943314cf6cd60d01625cb85ad207acfc4153f2cfffc74a1e6621d4f124df4c6d2d62801a8822211a1c422756b
 EBUILD golly-4.2.ebuild 1481 BLAKE2B da8efee8856ec2f00f3c1e6ea2ba33cc28f7cf09da424f749049dabfeb97db36e5d52cc9a9d3fdd01c5e5f16fb2049084b5d9885f8759feac8bd1a4a9a4bdfa9 SHA512 293359d4150f9ed8458f597bcf590dae54d0eb98229493d7a98c7143b0be012fcbb1e4fb24bbcdfc247b95adde5eb1a2787d4e49965a5932c48580af78817489
 MISC metadata.xml 571 BLAKE2B 64399eaf28ab52d39c1338758ca1abc2f67f195e4320b01d411d00fc3e434065d25cbab6c886dddfcd18611cef4d057c0b74c22c73e432ce1c3efb22e523164a SHA512 7ddf9bbb0cb55f5beb5377b2f0a7823e125195d0019f45dfd26c0868fe57c69913d11946de5060416856ac68bca863fd06a1a1128704a8fa53fd494df4b106e5
diff --git a/app-misc/golly/golly-4.1-r1.ebuild b/app-misc/golly/golly-4.1-r1.ebuild
deleted file mode 100644
index 3a22aa296ccd..000000000000
--- a/app-misc/golly/golly-4.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python3_{9,10} )
-
-inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-S="${WORKDIR}/${P}-src"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,sdl,tiff]
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.0-CFLAGS.patch )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_compile() {
-	local mymakeopts=(
-		ENABLE_SOUND=yes
-		GOLLYDIR="${EPREFIX}/usr/share/${PN}"
-		PYTHON=${EPYTHON}
-		WX_CONFIG=${WX_CONFIG}
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		CXXC="$(tc-getCXX)"
-		RANLIB="$(tc-getRANLIB)"
-	)
-	emake -C gui-wx -f makefile-gtk "${mymakeopts[@]}"
-}
-
-src_install() {
-	# has no 'make install' Let's install files manually.
-	dobin golly bgolly
-	insinto /usr/share/${PN}
-	doins -r Help Patterns Scripts Rules docs
-
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index eb8d4f64751f..e2d20c4aa59f 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,5 +1,7 @@
-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
+AUX wcd-6.0.3-doc-path.patch 404 BLAKE2B d0eb14b7ae02f6c1743b9dc059d5b7285a1647adc94ef0bb9403ecb740f498c1d37308d21de4bef7cb4efb68dc9304ace7b8de7f71a51dde566aa065afc6981b SHA512 42997606a976d104b4b92961bc0dcd43ca0b28469bd3cb158e9225a407ab5b72a56ae86c0d90a1975c4b09e7a9ce671a7ad2178a94b3a6c85b25b47d16beea84
+AUX wcd-6.0.4-gentoo.patch 2574 BLAKE2B d3015521a75f631a752c8002703e4291923d75a93ffeddcfcb3b8c1b4950f3f18f37b570a42c0c0076ee83a262584f4efe67d863c666ef89a86f0f897f8dc5a4 SHA512 3bed84492c32a8dfbb6779c6b856be558d2ee4c97302ecf44fc94f92bcd9fe16d3dc9ce7794809a064ccaff87a3321f25c5460eb8db12249a6c2c1cf97641c77
 DIST wcd-6.0.4.tar.gz 935815 BLAKE2B 00ec281890fe363258e0c847460ad9067f1c14409e64dfde239340ecf4f711af2047a8a1da226d4d17797e2b7452a4cd5aa65a0fcedcc2c172378d35a18a4a20 SHA512 afec27c0ca4cf7c7d24399f1f23c69ee765d57b449179696be5da82bcd6b146156254d9d1264e9c1f4905d5c117c7ac935a372aea25fa539b76c9bc866640daa
+DIST wcd-6.0.5.tar.gz 1130436 BLAKE2B 65ba203f42ada8657ca11ec15a3a76d31523b0dc388415fbbc58e710e2ffec5b96f85d962ddcdb07b7749395223c64e367402106aa7d5a8910f63d09ffac004c SHA512 ac3fc0690e2011ab3a6863f075859a53887a7826b456f35b13421f8c3ed23e0a4665d9641163a2142ffae18b26379b2dbefab75a124c556bd0103522aaeb3d13
 EBUILD wcd-6.0.4.ebuild 995 BLAKE2B 15aa2a84af102682497e440199cb7210f5ec53d7f27ffa444d3ace45caeb09246fcac5b73577d699b9a97e453fef2cee49beeda079363445d3920b0c4b97a4de SHA512 52877815631e3e3e9739ce90c39308f86b0c8fa29eeeca6a41f2c4251521be617627fe05b153bc33b116ce9ebf38540334a0791525bd250580bd2b3b194547ff
-MISC metadata.xml 272 BLAKE2B a253052dbe7dfd2dea2cdc3692698a5a94d0e2414979a348d56448cee6329b7fe29a1f252146f9ff04c1ea3b270996631395ecea454ac901eb726dc0b4dd9f29 SHA512 247c1006dd352c3cc7ee07dee2f283394767bdc0f72f0438a6cc845ac53549c05b3741c64ffedb992f003759e67f24aaa7121561db97d1b095c11269115746dc
+EBUILD wcd-6.0.5.ebuild 995 BLAKE2B 758803a5b64b5609fc43dc61c89032afebba56cd49477004daab9f01475301c45f94c0aad295c8ba7f5cb7133118d58cdf8eb47736ef212011a68a3aabde63b8 SHA512 d2a5789dd7ab97124e86ed699c8429e40a8d5410083706eceee26b7712bcc5a928123fcdaa1e91c45a0d5e3ad9c65af672d1855170ca3858355781df2fa05729
+MISC metadata.xml 488 BLAKE2B 9d55eca645c451bafe78fc58278a25ea4d732fc0cfe85c173407dbe676a6f755809c2e8f662e726fa1c84b123281843e4a3f83f9e4e0a3880cb651c0010ac0b5 SHA512 d38b8ec01c0793606415370891f5c5da45fb94c9c1177195411294b9792a3d3de0d0da6161a40d6db7d6e338f61578df87a943dd9afb2b0ac939ddb6a5c48ef6
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"
+}