gentoo resync : 05.12.2021

2 files changed, 29 insertions, 31 deletions

diff --git a/dev-db/libodbc++/Manifest b/dev-db/libodbc++/Manifest
index 09c74f78c86d..06df7e2e05e1 100644
--- a/dev-db/libodbc++/Manifest
+++ b/dev-db/libodbc++/Manifest
@@ -2,5 +2,5 @@ AUX libodbc++-0.2.3-doxygen.patch 561 BLAKE2B 4b1813dc89760c0e70d36f853c21e5a830
 AUX libodbc++-0.2.3-gcc41.patch 456 BLAKE2B ad9de19388669c345cd619ab95518e0a8c3ca4dc5b246bedc386c76ae45a1d89e5fe1a9c15e88e298e1f228fcf066a4e2c3237e60f75bc893c695aa3a518526a SHA512 9b758fab94141338f42d9ce4291620bb839f7d044a9020de90258b70ef0554bb128879a3008bbafae9e5fab2082170d1a2b9e631d5ea7ef5c23eaf03f14d7615
 AUX libodbc++-0.2.3-gcc44.patch 316 BLAKE2B a7c4e6466b9c3b0b4aca8ea4288df30a86e462835fba4b63cb1c7c1925732bcb75f5652d154bb7223fe135dccfc0308167e0f521e958b2ef3262a24d17820353 SHA512 6b8b6f57523e9128927530d95477c3c55a27c47836e7231e8017958bd20407e637fd4896015a2a3fbf2e47e3e44f7f3e933a28c4ac84fc600366b899462aebb1
 DIST libodbc++-0.2.5.tar.bz2 362310 BLAKE2B c0266eef510f8bee3c430b6998f68859955968ee26b1ce8b456a497f84ad5f67ef96b474de0966aa07ff4ef308737103887c949704635696b095fef0bbfe59f7 SHA512 cc2485a0dae8a3f548a26a759f1421133a0a23715296f632067f5967b61778ca64e1339e19a4de15d06fb80b4e43ec8ddb13ba170b70dd7202c4d07b5669c2c7
-EBUILD libodbc++-0.2.5-r2.ebuild 3235 BLAKE2B d49f53bd9748e0f744010380660395265ef81b14fc860dd22e49cd9619b131bb0052803650e04df29a936978820556f00f84887325dfb45a67a0cd092fd2d67f SHA512 f2657922548b59197ebb421ffb2d364eff1641227505d937bf9b767c9c3806153ba3e6a53c8a58018f35d1b21dd0cb23d1319d8418771a956e20b4c9e88dd53f
+EBUILD libodbc++-0.2.5-r3.ebuild 3057 BLAKE2B 409d8ada77ee515c23f816fe40c33af8c5983c702972f4e7da82c3ca0f26394d26fb604b2ef254f45759dbd72643764d57f92774ba2485f4336d9a8a5ed0b5a5 SHA512 cdf28a5390ca4077696a8bb75947f3065eba4d30c8d20cf9272b977e6834f1db7d573b93e9dae14ec4c6c627da7c18f04e44702eb8beaa0433746b1483c1062c
 MISC metadata.xml 298 BLAKE2B 9d1d9689809b96753443e12c0fc514870e80175c107e39a19acea88062e6dde12929cb9a871c711014509304040597166bb6415b0616478e78426166b0ec1205 SHA512 88fea8cac3d7b052868053c504d231e77e2319e6c42cad89c1de2f204e771fa4a3c2542f37ec540bc3973bda790cdf6df653971e1622f4e53c417618c2813fcb
diff --git a/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild b/dev-db/libodbc++/libodbc++-0.2.5-r3.ebuild
index 7f0ddc69be4c..3241509b98af 100644
--- a/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild
+++ b/dev-db/libodbc++/libodbc++-0.2.5-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch flag-o-matic
+EAPI=8
+
+inherit flag-o-matic
 
 DESCRIPTION="Provides a subset of the well-known JDBC 2.0(tm) and runs on top of ODBC"
 SRC_URI="mirror://sourceforge/libodbcxx/${P}.tar.bz2"
@@ -12,8 +13,6 @@ LICENSE="LGPL-2.1"
 SLOT=0
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
 
-IUSE="static-libs"
-
 DEPEND="dev-db/unixODBC
 		sys-libs/ncurses"
 RDEPEND="${DEPEND}"
@@ -24,27 +23,26 @@ SB_MT="${S}-build-mt"
 #SB_QT="${S}-build_qt"
 #SB_QT_MT="${S}-build_qt-mt"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2.3-doxygen.patch
+	"${FILESDIR}"/${PN}-0.2.3-gcc41.patch
+	"${FILESDIR}"/${PN}-0.2.3-gcc44.patch
+)
+
 src_prepare() {
-	#epatch "${FILESDIR}"/${PN}-0.2.3-std-streamsize.patch
-	epatch "${FILESDIR}"/${PN}-0.2.3-doxygen.patch
-	epatch "${FILESDIR}"/${PN}-0.2.3-gcc41.patch
-	#epatch "${FILESDIR}"/${PN}-0.2.3-gcc43.patch
-	#epatch "${FILESDIR}"/${PN}-0.2.3-typecast.patch
-	epatch "${FILESDIR}"/${PN}-0.2.3-gcc44.patch
+	default
 
 	# Fix configure to use ncurses instead of termcap (bug #103105)
-	sed -i -e 's~termcap~ncurses~g' configure
+	sed -i -e 's~termcap~ncurses~g' configure || die
 
 	# Fix undeclared ODBCXX_STRING_PERCENT symbol, bug #532356
 	sed -i -e 's/ODBCXX_STRING_PERCENT/"%"/' src/dtconv.h || die
-
-	epatch_user
 }
 
 src_configure() {
 	local commonconf buildlist
-	commonconf="--with-odbc=/usr --without-tests"
-	commonconf="${commonconf} $(use_enable static-libs static) --enable-shared"
+	commonconf="--with-odbc=${EPREFIX}/usr --without-tests"
+	commonconf="${commonconf} --enable-shared"
 	# " --enable-threads"
 
 	export ECONF_SOURCE="${S}"
@@ -53,14 +51,15 @@ src_configure() {
 	buildlist="${SB} ${SB_MT}"
 	#use qt3 && buildlist="${buildlist} $SB_QT $SB_QT_MT"
 
+	local sd
 	for sd in ${buildlist}; do
 		einfo "Doing configure pass for $sd"
-		mkdir -p "${sd}"
-		cd "${sd}"
+		mkdir -p "${sd}" || die
+		cd "${sd}" || die
 		commonconf2=''
 		LIBS=''
-		[ "${sd}" == "${SB_MT}" -o "${sd}" == "${SB_QT_MT}" ] && commonconf2="${commonconf2} --enable-threads"
-		[ "${sd}" == "${SB_QT}" -o "${sd}" == "${SB_QT_MT}" ] && commonconf2="${commonconf2} --with-qt"
+		[[ "${sd}" == "${SB_MT}" || "${sd}" == "${SB_QT_MT}" ]] && commonconf2="${commonconf2} --enable-threads"
+		[[ "${sd}" == "${SB_QT}" || "${sd}" == "${SB_QT_MT}" ]] && commonconf2="${commonconf2} --with-qt"
 		# isql++ tool fails to compile:
 		#libodbc++-0.2.5/isql++/isql++.cpp: In constructor 'Isql::Isql(odbc::Connection*)':
 		#libodbc++-0.2.5/isql++/isql++.cpp:275: error: invalid cast to function type 'char** ()()'
@@ -79,29 +78,28 @@ src_configure() {
 }
 
 src_compile() {
-	local buildlist failures
+	local buildlist failures sd
 	buildlist="${SB} ${SB_MT}"
 	#use qt3 && buildlist="${buildlist} $SB_QT $SB_QT_MT"
 	for sd in ${buildlist}; do
-		einfo "Doing compile pass for $sd"
-		cd "${sd}"
-		emake LIBS='' || failures="${failures} ${sd//${S}-}"
+		einfo "Doing compile pass for ${sd}"
+		emake -C "${sd}" LIBS='' || failures="${failures} ${sd//${S}-}"
 	done
-	[ -n "${failures}" ] && die "Failures: ${failures}"
+	[[ -n ${failures} ]] && die "Failures: ${failures}"
 }
 
 src_install() {
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
+	einstalldocs
 
+	local sd buildlist
 	buildlist="${SB} ${SB_MT}"
 	#use qt3 && buildlist="${buildlist} $SB_QT $SB_QT_MT"
 	for sd in ${buildlist}; do
-		einfo "Doing install pass for $sd"
-		cd ${sd}
-		emake DESTDIR="${D}" install
+		einfo "Doing install pass for ${sd}"
+		emake -C "${sd}" DESTDIR="${D}" install
 	done
 	if [[ "${P}" != "${PF}" ]]; then
-		mv "${D}"/usr/share/doc/${P}/* "${D}"/usr/share/doc/${PF}/
-		rmdir "${D}"/usr/share/doc/${P}
+		mv "${ED}"/usr/share/doc/${P}/* "${ED}"/usr/share/doc/${PF}/ || die
+		rmdir "${ED}"/usr/share/doc/${P} || die
 	fi
 }