[gentoo-commits] repo/gentoo:master commit in: dev-libs/poco/, dev-libs/poco/files/

["Sam James" <sam@gentoo.org>]

commit:     ee5d943e8ee9a1f2264aa4dbd603cecadb43e9b6
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Tue May  3 18:07:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May  6 07:47:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee5d943e

dev-libs/poco: clean old ebuild

Closes: https://bugs.gentoo.org/805050
Closes: https://bugs.gentoo.org/656174
Closes: https://bugs.gentoo.org/720978
Closes: https://bugs.gentoo.org/738718
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/poco/Manifest                            |   1 -
 dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch |  13 --
 dev-libs/poco/poco-1.9.0-r2.ebuild                | 137 ----------------------
 3 files changed, 151 deletions(-)

diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 0dc485b0a315..67505d010258 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -1,2 +1 @@
 DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73
-DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9

diff --git a/dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch b/dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch
deleted file mode 100644
index e41d8f390d9f..000000000000
--- a/dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindODBC.cmake b/cmake/FindODBC.cmake
-index 9e229ed..5d79c7e 100644
---- a/cmake/FindODBC.cmake
-+++ b/cmake/FindODBC.cmake
-@@ -16,7 +16,7 @@
- find_path(ODBC_INCLUDE_DIRECTORIES 
- 	NAMES sql.h
- 	HINTS
--	/usr/include
-+	/usr/include/iodbc
- 	/usr/include/odbc
- 	/usr/local/include
- 	/usr/local/include/odbc

diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild
deleted file mode 100644
index 191b5135b95c..000000000000
--- a/dev-libs/poco/poco-1.9.0-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="C++ libraries for building network-based applications"
-HOMEPAGE="https://pocoproject.org/"
-SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	7z? ( xml )
-	file2pagecompiler? ( pagecompiler )
-	iodbc? ( odbc )
-	mongodb? ( data )
-	mysql? ( data )
-	odbc? ( data )
-	pagecompiler? ( json net util xml )
-	pocodoc? ( cppparser util xml )
-	sqlite? ( data )
-	ssl? ( util )
-	test? ( data? ( sqlite ) json util xml )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=dev-libs/libpcre-8.42
-	mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= )
-		 mariadb? ( dev-db/mariadb-connector-c:0= ) )
-	odbc? ( iodbc? ( dev-db/libiodbc )
-		!iodbc? ( dev-db/unixODBC ) )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	xml? ( dev-libs/expat )
-	zip? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${P}-release"
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	if use test ; then
-		# ignore missing tests on experimental library
-		# and tests requiring running DB-servers, internet connections, etc.
-		sed -i -e '/testsuite/d' \
-			{Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF,Redis}/CMakeLists.txt || die
-		# Poco expands ~ using passwd, which does not match $HOME in the build environment
-		sed -i -e '/CppUnit_addTest.*testExpand/d' \
-			Foundation/testsuite/src/PathTest.cpp || die
-		# ignore failing Crypto test since upstream does not seem to care,
-		# see https://github.com/pocoproject/poco/issues/1209
-		sed -i -e '/RSATest, testRSACipherLarge/d' \
-			Crypto/testsuite/src/RSATest.cpp || die
-	fi
-
-	if use mariadb ; then
-		# Fix MariaDB detection
-		sed -i -e 's~/usr/include/mysql~~' \
-			-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
-		cmake/FindMySQL.cmake || die
-	else
-		# Fix MySQL detection
-		sed -i -e 's/mysqlclient_r/mysqlclient/' \
-			-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
-		cmake/FindMySQL.cmake || die
-	fi
-
-	# Add missing directory that breaks the build
-	mkdir -p Encodings/testsuite/data || die
-
-	if ! use iodbc ; then
-		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
-	fi
-}
-
-src_configure() {
-	# apache support is dead and buggy, https://github.com/pocoproject/poco/issues/1764
-	local mycmakeargs=(
-		-DPOCO_UNBUNDLED=ON
-		-DENABLE_APACHECONNECTOR=OFF
-		-DENABLE_CPPPARSER="$(usex cppparser)"
-		-DENABLE_CRYPTO="$(usex ssl)"
-		-DENABLE_DATA="$(usex data)"
-		-DENABLE_DATA_MYSQL="$(usex mysql)"
-		-DENABLE_DATA_ODBC="$(usex odbc)"
-		-DENABLE_DATA_SQLITE="$(usex sqlite)"
-		-DENABLE_JSON="$(usex util)"
-		-DENABLE_MONGODB="$(usex mongodb)"
-		-DENABLE_NET="$(usex net)"
-		-DENABLE_NETSSL="$(usex ssl)"
-		-DENABLE_NETSSL_WIN=OFF
-		-DENABLE_PAGECOMPILER="$(usex pagecompiler)"
-		-DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
-		-DENABLE_PDF="$(usex pdf)"
-		-DENABLE_POCODOC="$(usex pocodoc)"
-		-DENABLE_SEVENZIP="$(usex 7z)"
-		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_UTIL="$(usex util)"
-		-DENABLE_XML="$(usex xml)"
-		-DENABLE_ZIP="$(usex zip)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	POCO_BASE="${S}" cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use examples ; then
-		for sd in */samples ; do
-			docinto examples/${sd%/samples}
-			dodoc -r ${sd}
-		done
-		find "${D}/usr/share/doc/${PF}/examples" \
-			-iname "*.sln" -or -iname "*.vcproj" -or \
-			-iname "*.vmsbuild" -or -iname "*.properties" \
-			| xargs rm
-	fi
-}