gentoo auto-resync : 06:05:2023 - 17:34:33

4 files changed, 119 insertions, 1 deletions

diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 3a732464532b..97178956c102 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,5 +1,8 @@
+AUX unixODBC-2.3.11-config-no-install.patch 794 BLAKE2B 561f90c8f72938a525bc1f9870d62f800e147dc29681d60872804a001462c478977a6a644c253389adf3c412823c338cb97e34a0a59a0be19498fd3386c03d5c SHA512 cd00331a01313acb75fa762ff7d7dc61a01fa4a8a2225c8e0b0c28fc1e337954b48de38ec1aca3d459135faedae843f88799d406019a2056f98c9c9a93c173ee
 AUX unixODBC-2.3.9-clang16.patch 9332 BLAKE2B 8037f82286ae4a94698803530647ffb6d29c9b85da60320cbee27c60aa4bf6e004cba99abb5d5fc209be67a6fe016c6ed572fd179a75c5fe50b6403962fd11f7 SHA512 e1f92c192c6d441a4c3cf051fbb4929af403552c21a23adcf30657ad4bcbd4ca416322ea2e1bec6d1b1f0fb9883b243b1b84460746d56a8b28015f801af6b157
+DIST unixODBC-2.3.11.tar.gz 1752585 BLAKE2B fa1502d7b83c8c10ee9d54b23281096156a3e3ec893b81acf125cd95c1de0f4ae7657ab3b4c5214a5c6a0fc9209e53cd9acdf6f99e65840e0a05366182af5600 SHA512 dddc32f90a7962e6988e1130a8093c6fb8b9ff532cad270d572250324aecbc739f45f9d8021d217313910bab25b08e69009b4f87456575535e93be1f46f5f13d
 DIST unixODBC-2.3.9.tar.gz 1676145 BLAKE2B f4078f9266cea753b6f78d234290efe95a6fa9551088a6ce352b0b6ac5391bf2724f872dcc2df0368e98befd24f995ab4eb6958a34bb080b0f6d08993991a0b7 SHA512 6637eab751401522e0af775cb104cd07693b82927453a98e5af28e079f4b9f40e1cfab8cb36f509c46dced89b45244bc5ed1a3dda17ba5a52a844e8e82f187bb
+EBUILD unixODBC-2.3.11.ebuild 2067 BLAKE2B 371a4c5836be221a84ecd62f36477772f8140b36eab8ed27ed2cbb4a41afa42070ab3c5b709e7680c9b3b03c6e6c901de0b36ba00b1e0d366cd0ffef3efbe829 SHA512 b1adeffa94592318f78de1f5282bd8c492b7152587458f94b8314371e91a4ff4fdc1a6025439d2884821b766415910070e96b4e416496974abeee8be7ca22094
 EBUILD unixODBC-2.3.9-r1.ebuild 1947 BLAKE2B 200806b69dadffbb264855c4794085e3606ce9cd8825d38328091a021d7fa378ccf242cd00fe945b9ef334d7f1d2f34d711c02b6571886ebb9d51ba78567cd34 SHA512 b03a0c8194db93faf43970603277905150ef329dac246a96acfe124fb48de387ec87362abe3383e27373353453789df41a271b6e4b8a85cf0e6756a5fe2408e4
 EBUILD unixODBC-2.3.9.ebuild 1823 BLAKE2B eb9beb124808cc49f19ced7301b4ced73451ae73b1551a250e163d1081658f8531a21e6c3165067f46d88ea09914a6329dae880a7486c7a41797535b66d26f7a SHA512 75250bf39439732fca97e50ca4df4973027a0f08022e5ae5ebea51f3c436a0e3c53f66e7221a84ec2396833b991fbbd0e9b05f3b6b6cd77d5ad01a89bbfeca89
-MISC metadata.xml 394 BLAKE2B 3757c7cab01702b3ae8504d808ae045c9db61d6e2b395cfc5818db0cde33384bb7935d56155191751eba837b034aad71462d146fd0b914e3c5c1d4558770cfca SHA512 0814f6cec2a7a42c28a2b9c0bc74adf57861885ce1645437d217f777d1f2c6f507df2c28dc15d153a07a6a1e1e3d98589497c192ccf33684cf190b9d62b5ee8e
+MISC metadata.xml 479 BLAKE2B 298fd55d5c29508598a3e221f0d3b850b3f2e195885460c5a9cb9d4111d9246576d1ae0c8c586f6484931ea2b8b9a2e0127db5e4c01c456e66fb66436b62f2aa SHA512 a751b3121ce1298c50e4f66ce8c654d578be088fdf52490a4149d380053bef287736d27ef1b430fef789019cc1e0f53904cafc6c292d984a78da105a493be6a5
diff --git a/dev-db/unixODBC/files/unixODBC-2.3.11-config-no-install.patch b/dev-db/unixODBC/files/unixODBC-2.3.11-config-no-install.patch
new file mode 100644
index 000000000000..f7b276523f83
--- /dev/null
+++ b/dev-db/unixODBC/files/unixODBC-2.3.11-config-no-install.patch
@@ -0,0 +1,33 @@
+https://github.com/lurcher/unixODBC/commit/685df9e2b4fbbd191ab081a2020956aa78295fe0
+
+From 685df9e2b4fbbd191ab081a2020956aa78295fe0 Mon Sep 17 00:00:00 2001
+From: Hugh McMaster <hugh.mcmaster@outlook.com>
+Date: Fri, 13 May 2022 22:03:37 +1000
+Subject: [PATCH] Makefile.am: Do not install config.h
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-ACLOCAL_AMFLAGS=-I m4 
++ACLOCAL_AMFLAGS=-I m4
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = \
+@@ -21,7 +21,7 @@ SUBDIRS = \
+ 	include \
+ 	doc \
+ 	man \
+-	samples 
++	samples
+ 
+ EXTRA_DIST = \
+ 	README.OSX \
+@@ -47,7 +47,7 @@ EXTRA_DIST = \
+ 
+ include_HEADERS = unixodbc.h
+ 
+-pkginclude_HEADERS = unixodbc_conf.h config.h
++pkginclude_HEADERS = unixodbc_conf.h
+ 
+ install-data-hook:
+ 	-$(MKDIR_P) $(DESTDIR)$(sysconfdir)/ODBCDataSources
diff --git a/dev-db/unixODBC/metadata.xml b/dev-db/unixODBC/metadata.xml
index 7b5139cb9fd6..106e5cc79ace 100644
--- a/dev-db/unixODBC/metadata.xml
+++ b/dev-db/unixODBC/metadata.xml
@@ -6,4 +6,7 @@
     <flag name="minimal">Disable bundled drivers and extra libraries (most users don't need these)</flag>
     <flag name="odbcmanual">Administrator, Internal Structure, Programmer and User documentation</flag>
   </use>
+  <upstream>
+    <remote-id type="github">lurcher/unixODBC</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-db/unixODBC/unixODBC-2.3.11.ebuild b/dev-db/unixODBC/unixODBC-2.3.11.ebuild
new file mode 100644
index 000000000000..f6277a5282a5
--- /dev/null
+++ b/dev-db/unixODBC/unixODBC-2.3.11.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Complete ODBC driver manager"
+HOMEPAGE="https://www.unixodbc.org/"
+SRC_URI="https://www.unixodbc.org/unixODBC-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+minimal odbcmanual static-libs unicode"
+
+RDEPEND="
+	dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+	>=sys-libs/readline-6.2_p5-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/ncurses-5.9-r3:=[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/unixODBC/unixodbc_conf.h /usr/include/unixodbc.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.9-clang16.patch
+	"${FILESDIR}"/${P}-config-no-install.patch
+)
+
+src_prepare() {
+	default
+
+	# Only needed for config.h install patch
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# Needs flex, bison
+	export LEX=flex
+	unset YACC
+
+	# --enable-driver-conf is --enable-driverc as per configure.in
+	local myeconfargs=(
+		--cache-file="${BUILD_DIR}"/config.cache
+		--sysconfdir="${EPREFIX}"/etc/${PN}
+		--disable-editline
+		--disable-static
+		--enable-iconv
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable !minimal drivers)
+		$(use_enable !minimal driverc)
+		$(use_with unicode iconv-char-enc UTF8)
+		$(use_with unicode iconv-ucode-enc UTF16LE)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use odbcmanual ; then
+		# We could simply run "make install-html" if we'd not had
+		# out-of-source builds here.
+		docinto html
+		dodoc -r doc/.
+		find "${ED}/usr/share/doc/${PF}/html" -name "Makefile*" -delete || die
+	fi
+
+	use prefix && dodoc README*
+	find "${ED}" -type f -name '*.la' -delete || die
+}