From ab7661574769e1adf2741f6284af09519e7cec0d Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 17 May 2023 13:01:09 +0200
Subject: [PATCH] neon, bump version, drop x86_gcc2 (#8658)

---
 ...{neon-0.31.2.recipe => neon-0.32.5.recipe} | 31 +++++++++++++------
 net-libs/neon/patches/neon-0.31.2.patch       | 12 -------
 net-libs/neon/patches/neon-0.32.5.patchset    | 23 ++++++++++++++
 3 files changed, 44 insertions(+), 22 deletions(-)
 rename net-libs/neon/{neon-0.31.2.recipe => neon-0.32.5.recipe} (81%)
 delete mode 100644 net-libs/neon/patches/neon-0.31.2.patch
 create mode 100644 net-libs/neon/patches/neon-0.32.5.patchset

diff --git a/net-libs/neon/neon-0.31.2.recipe b/net-libs/neon/neon-0.32.5.recipe
similarity index 81%
rename from net-libs/neon/neon-0.31.2.recipe
rename to net-libs/neon/neon-0.32.5.recipe
index a7625c71e..fa8fe4210 100644
--- a/net-libs/neon/neon-0.31.2.recipe
+++ b/net-libs/neon/neon-0.32.5.recipe
@@ -20,15 +20,22 @@ HOMEPAGE="https://notroj.github.io/neon/
 	https://github.com/notroj/neon"
 COPYRIGHT="1999-2021 Joe Orton and others"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://notroj.github.io/neon/neon-$portVersion.tar.gz"
-CHECKSUM_SHA256="cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678"
-PATCHES="neon-$portVersion.patch"
+CHECKSUM_SHA256="4872e12f802572dedd4b02f870065814b2d5141f7dbdaf708eedab826b51a58a"
+PATCHES="neon-$portVersion.patchset"
 
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
-libVersion="27.4.2"
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="27.5.5"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -46,7 +53,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	neon${secondaryArchSuffix}_devel = $portVersion compat >= 0.29
-	cmd:neon_config$secondaryArchSuffix = $portVersion compat >= 0.29
+	cmd:neon_config$commandSuffix = $portVersion compat >= 0.29
 	devel:libneon$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
@@ -79,7 +86,8 @@ BUILD()
 	echo 'LT_INIT' >> configure.ac
 	echo 'AC_CONFIG_MACRO_DIR([macros])' >> configure.ac
 	./autogen.sh
-	runConfigure ./configure \
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
 		--with-ssl=openssl \
 		--with-libxml2 \
 		--enable-shared \
@@ -95,12 +103,15 @@ INSTALL()
 	rm $libDir/libneon.la
 
 	prepareInstalledDevelLib libneon
-	fixDevelopLibDirReferences $binDir/neon-config
+	fixDevelopLibDirReferences $commandBinDir/neon-config
 	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
-		$binDir/neon-config \
+		$commandBinDir/neon-config \
 		$developDir \
 		$documentationDir
+
+	# cleanup
+	rm -r $commandBinDir
 }
diff --git a/net-libs/neon/patches/neon-0.31.2.patch b/net-libs/neon/patches/neon-0.31.2.patch
deleted file mode 100644
index 7bdb12180..000000000
--- a/net-libs/neon/patches/neon-0.31.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur orig/neon-0.29.6/Makefile.in neon-0.29.6/Makefile.in
---- orig/neon-0.29.6/Makefile.in	2009-09-04 09:36:26.062914560 +0200
-+++ neon-0.29.6/Makefile.in	2013-04-30 19:33:32.347340800 +0200
-@@ -22,7 +22,7 @@
- man3dir = $(mandir)/man3
- datarootdir = @datarootdir@
- datadir = @datadir@
--docdir = $(datadir)/doc/neon-@NEON_VERSION@
-+docdir = @docdir@
- includedir = @includedir@
- neonincludes = $(includedir)/neon
- pkgconfigdir = $(libdir)/pkgconfig
diff --git a/net-libs/neon/patches/neon-0.32.5.patchset b/net-libs/neon/patches/neon-0.32.5.patchset
new file mode 100644
index 000000000..9c903bd00
--- /dev/null
+++ b/net-libs/neon/patches/neon-0.32.5.patchset
@@ -0,0 +1,23 @@
+From 6fcc1f8a52f9c80d1d0e43ab757a62903f4293d6 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Wed, 17 May 2023 11:39:43 +0200
+Subject: Import previous patch, move docs from $dataDir/doc to
+ $documentationDir
+
+
+diff --git a/Makefile.in b/Makefile.in
+index 148b43a..a03dacf 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -22,7 +22,7 @@ man1dir = $(mandir)/man1
+ man3dir = $(mandir)/man3
+ datarootdir = @datarootdir@
+ datadir = @datadir@
+-docdir = $(datadir)/doc/neon-@NEON_VERSION@
++docdir = @docdir@
+ includedir = @includedir@
+ neonincludes = $(includedir)/neon
+ pkgconfigdir = $(libdir)/pkgconfig
+-- 
+2.37.3
+