gentoo auto-resync : 10:06:2023 - 09:50:45

4 files changed, 2 insertions, 141 deletions

diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 65474ab25fb5..fdabf08457e1 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,8 +1,5 @@
 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 2018 BLAKE2B 57c577a361aac7f052260e572fef876d74165199a38977a1f9cadb9ff1ca0bc0ccca502b7a75f088f1e727920727781a2ce6f41d3833106bd19cbf7b8a6fbcc2 SHA512 6b55ab5a2c101d2e8ff739473921f4de2338b10850221b62a37ee1a2d2784e8d00b82b2c2bdb0b9f02e12d263f8c350f6281073322e0522bef60656bfdc4a7cd
-EBUILD unixODBC-2.3.9-r1.ebuild 1894 BLAKE2B 537606e377e4a8af4e325fc1d39b1d435ff2ab118e360546e9a3779632dfbc248097853f7f6ad97f066d9c43ff4778e057ef3a636d9d89ec8ef6cfe3f9f45e42 SHA512 32366dd52b3a6bc3a037bdb7fedf8e29bd49061eccc1919c33d5d1dddeaaa5e1447c11b41701ccc94456f97fd3a2bd0545bb8411ce26d7c82ba1ebc5197c757b
-EBUILD unixODBC-2.3.9.ebuild 1778 BLAKE2B e0567c8807fe6c67625e6a9bdf3dadaf9811693bcdec5f944020738965b9a44ef0ce9cd295440ed95e6b600ee12d5d8b5a831425e4c7ff737689237c9ca76af3 SHA512 87ed3464dbe4b3b575ed717bd384f5351e25dfbd7b9512d93116fd3d89b4c37c2a73676a387f7362c000052a981c850f26ef2728ddb59934d001844cf1723e2f
+EBUILD unixODBC-2.3.11.ebuild 2014 BLAKE2B df9d7a1c6b0934dc02763883c2d5aa813e187bab0f84a296a45f1daab965e9176d4fa46afc2de12b6c6ecadbac44d84ab8c1c21cf3cbb7b1754657af6afe8165 SHA512 581973d3863f3e728e6c3ab7d02143ab9d77ee64b37570226ae760ab235354da75127357254b77a57490e504529e7f0f3d24d1b0ccb93e264dddb005f9aa1bbc
 MISC metadata.xml 479 BLAKE2B 298fd55d5c29508598a3e221f0d3b850b3f2e195885460c5a9cb9d4111d9246576d1ae0c8c586f6484931ea2b8b9a2e0127db5e4c01c456e66fb66436b62f2aa SHA512 a751b3121ce1298c50e4f66ce8c654d578be088fdf52490a4149d380053bef287736d27ef1b430fef789019cc1e0f53904cafc6c292d984a78da105a493be6a5
diff --git a/dev-db/unixODBC/unixODBC-2.3.11.ebuild b/dev-db/unixODBC/unixODBC-2.3.11.ebuild
index 527a5f9db0c4..4f2306d56f48 100644
--- a/dev-db/unixODBC/unixODBC-2.3.11.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.11.ebuild
@@ -11,7 +11,7 @@ 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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="+minimal odbcmanual static-libs unicode"
 
 RDEPEND="
diff --git a/dev-db/unixODBC/unixODBC-2.3.9-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.9-r1.ebuild
deleted file mode 100644
index 39d601b536fd..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.9-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal
-
-DESCRIPTION="complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.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 ~x64-solaris"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-RDEPEND="
-	|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/ncurses-5.9-r3:0=[${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_conf.h )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-clang16.patch
-)
-
-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
-}
diff --git a/dev-db/unixODBC/unixODBC-2.3.9.ebuild b/dev-db/unixODBC/unixODBC-2.3.9.ebuild
deleted file mode 100644
index 856166ada39d..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.9.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib-minimal
-
-DESCRIPTION="complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.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 ~x64-solaris"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-RDEPEND="
-	|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
-
-multilib_src_configure() {
-	# --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
-}