gentoo resync : 23.09.2020

5 files changed, 0 insertions, 155 deletions

diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 3dc489f21481..833367d2cb1f 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,9 +1,4 @@
-AUX ldflags.patch 452 BLAKE2B c2adba2e1cb395eb2261397acc879ab8cb82ef776cfd5e53411761d1ebf91017cd5bbe14654d814798149d2838efc90979273a406d8ab8c72b343e8453d8ec5d SHA512 472d66b3071de94d4753773092c4781f5b4419041dc23b777bc13e8e4f4a1a40f245931479fc294c43a9e73f322e93b2055fb52a1070423d58dd32f23b0f61ca
 AUX omniNames 571 BLAKE2B d1a151abb6faf582478e3892b7b057f92263fa0278cb3f3fb82fec20ba60b3e40733fcc2b223286466c9f4eb60fbe49cd9ce239f95e7e1cccb5b5b1df2e88893 SHA512 98f08cd0bef699bdd8da026efbf211c5bf8dfa5bb24bd4438581dd4acf6cbabdb42e19de5a5d8ae9db74bafea86fb316ff75f3278c255cab7277f95681578044
-AUX omniORB-4.1.4-format-security.patch 557 BLAKE2B 3aef2fdebedfdaf91cac169aa04715c37509e6d86bfc03a0171af238e232f3d2b9b59e69f2a01c6b35d291a4dba199ec6cf2c80203ee58478318ca0fb5a89f58 SHA512 f2d9ca53f9dcdac7fc0224e435ee7d4eecaf5c948d406f94e81a9ae7770d192b18e846ddd245c5b74e77efb7030902b9f2817b13349f2a685caadb05633e14ee
-AUX omniORB-4.1.4-openssl-1.patch 770 BLAKE2B ffdb15d5e48ae4cad6ee0c75334c48634f450a9f128fe84b3a345ce72f4be551e203ed21978dbd0381b610b98cc64375dd4bd873a33b9403374980b7e17b1264 SHA512 b43adc69ec30a3a1cf6581e050ca93927b267c67623aafdb53db0135a8d4164c779a9d54249c8672e5d8f1c761681092be3c2908cb772820d019db1e2b1ba396
-DIST omniORB-4.1.4.tar.gz 3093814 BLAKE2B 6f85ff31f55533eac779554a165346fa693c41e261650f22c5d1889de731a5ca3b09d178945dee89b80553a81e7a9db3286efd465b4aafcb7c19e5dc5de5d105 SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c
 DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad
-EBUILD omniORB-4.1.4-r2.ebuild 2184 BLAKE2B b35249c5020bb321c91e7327edba33f7325a93352eba985cb695c0d62cf5fd13ed62529900197c43c5eb7aaa7c5ec8a901e67766c2ddae65eb687334ece63c8a SHA512 a4d08d26cdf8b7fbee13bed2a92eee52190ccdba863a46f8b87cd210fb212ef2eb85a0a84ec1e6895f360d3b1ae76d91c2f15a322bf85e0e35759d4c659185af
 EBUILD omniORB-4.2.2.ebuild 2699 BLAKE2B 7d90ee3818c33c9789e895fda80aa51311f37ea719272f2908e530a24568fb9befae217d695ef2287eb83bbc3abfea03f37692c8f7b4d1be97bd7f289414ac50 SHA512 11149736ef2da11c63a961767e1193bced15b818905c5c8d290d3e38eb8e18014523219a1f4f6ba662d8ac7a66c47362d9ad455c84ef4a8c7c07a0725e17dcb7
 MISC metadata.xml 247 BLAKE2B c2c840442760456aa29eeda2b225baa3eca5af75444074a09d500b1063f59ce978b5053c0d79fb7cd3717a477ef8e8e343dcf731a5a99e27058b0528c5066a4f SHA512 d76af24fd2513c0ed4a1f3066c9e9b9eb6407d1c013f22b3bcc9646fb771560c45c42c3851075ce9aa32bfe6ef68534cf1ccd3fefc9657fdb0b2794424ab8d1f
diff --git a/net-misc/omniORB/files/ldflags.patch b/net-misc/omniORB/files/ldflags.patch
deleted file mode 100644
index 471df27ae7f4..000000000000
--- a/net-misc/omniORB/files/ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mk/beforeauto.mk.in.orig	2010-04-24 21:13:17.000000000 +0200
-+++ mk/beforeauto.mk.in	2010-04-24 21:14:24.000000000 +0200
-@@ -541,7 +541,7 @@
- SharedLibraryLibNameTemplate  	= lib$$1$$2.$(SHAREDLIB_SUFFIX)
- SharedLibraryImplibNameTemplate = lib$$1$$2.a
- 
--SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-soname,$$soname
-+SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-soname,$$soname @LDFLAGS@
- 
- define SharedLibraryFullName
- fn() { \
diff --git a/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch b/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch
deleted file mode 100644
index 2af8d21d308d..000000000000
--- a/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/tool/omniidl/cxx/cccp/cccp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tool/omniidl/cxx/cccp/cccp.c b/src/tool/omniidl/cxx/cccp/cccp.c
-index 0198b1a..64d80ae 100644
---- a/src/tool/omniidl/cxx/cccp/cccp.c
-+++ b/src/tool/omniidl/cxx/cccp/cccp.c
-@@ -8034,7 +8034,7 @@ macroexpand (hp, op)
-       else
- 	parse_error = macarg (NULL_PTR, 0);
-       if (parse_error) {
--	error_with_line (line_for_error (start_line), parse_error);
-+	error_with_line (line_for_error (start_line), "%s", parse_error);
- 	break;
-       }
-       i++;
diff --git a/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch b/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch
deleted file mode 100644
index 968013a25781..000000000000
--- a/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://bugs.gentoo.org/326791
-
---- include/omniORB4/sslContext.h
-+++ include/omniORB4/sslContext.h
-@@ -111,7 +111,11 @@
-   virtual ~sslContext();
- 
-  protected:
--  virtual SSL_METHOD* set_method(); 
-+  #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+  virtual const SSL_METHOD* set_method();
-+  #else
-+  virtual SSL_METHOD* set_method();
-+  #endif
-   // Default to return SSLv23_method().
- 
-   virtual void set_supported_versions(); 
---- src/lib/omniORB/orbcore/ssl/sslContext.cc
-+++ src/lib/omniORB/orbcore/ssl/sslContext.cc
-@@ -197,7 +197,11 @@
- }
- 
- /////////////////////////////////////////////////////////////////////////
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+const SSL_METHOD*
-+#else
- SSL_METHOD*
-+#endif
- sslContext::set_method() {
-   return SSLv23_method();
- }
diff --git a/net-misc/omniORB/omniORB-4.1.4-r2.ebuild b/net-misc/omniORB/omniORB-4.1.4-r2.ebuild
deleted file mode 100644
index 183a5713a85a..000000000000
--- a/net-misc/omniORB/omniORB-4.1.4-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1
-
-DESCRIPTION="A robust, high-performance CORBA 2 ORB"
-HOMEPAGE="http://omniorb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/omniorb/${P}.tar.gz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="doc ssl static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	ssl? ( >=dev-libs/openssl-0.9.6b:0= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# respect ldflags, bug #284191
-	epatch \
-		"${FILESDIR}"/ldflags.patch \
-		"${FILESDIR}"/${P}-openssl-1.patch \
-		"${FILESDIR}"/${P}-format-security.patch
-
-	sed \
-		-e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
-		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
-		-i mk/beforeauto.mk.in mk/platforms/i586_linux_2.0*.mk || \
-		die "sed failed"
-}
-
-src_configure() {
-	mkdir build && cd build || die
-
-	local MY_CONF="--prefix=/usr --with-omniORB-config=/etc/omniorb/omniORB.cfg \
-		--with-omniNames-logdir=/var/log/omniORB --libdir=/usr/$(get_libdir)"
-
-	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
-
-	ECONF_SOURCE=".." econf ${MY_CONF} $(use_enable static-libs static)
-}
-
-src_compile() {
-	cd build || die
-	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	cd build || die
-	default
-	# this looks redundant
-	rm "${ED}/usr/bin/omniidlrun.py" || die
-
-	cd "${S}" || die
-
-	if use doc; then
-		dohtml doc/*.html
-		dohtml -r doc/omniORB
-		docinto print
-		dodoc doc/*.pdf
-	fi
-
-	cat <<- EOF > "${T}/90omniORB"
-		PATH="/usr/share/omniORB/bin/scripts"
-		OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
-	EOF
-	doenvd "${T}/90omniORB"
-	doinitd "${FILESDIR}"/omniNames
-
-	cp "sample.cfg" "${T}/omniORB.cfg" || die
-	cat <<- EOF >> "${T}/omniORB.cfg"
-		# resolve the omniNames running on localhost
-		InitRef = NameService=corbaname::localhost
-	EOF
-	insinto /etc/omniorb
-	doins "${T}"/omniORB.cfg
-
-	keepdir /var/log/omniORB
-
-	python_optimize
-	python_fix_shebang "${ED}"/usr/bin/omniidl
-}
-
-pkg_postinst() {
-	elog "Since 4.1.2, the omniORB init script has been renamed to omniNames for clarity."
-}