Drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

3 files changed, 22 insertions, 106 deletions

diff --git a/net-misc/omniORB/ChangeLog b/net-misc/omniORB/ChangeLog
index 726b570dfddf..d5ed92e9b98f 100644
--- a/net-misc/omniORB/ChangeLog
+++ b/net-misc/omniORB/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/omniORB
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.76 2015/05/17 20:20:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.77 2015/05/18 06:31:25 jlec Exp $
+
+  18 May 2015; Justin Lecher <jlec@gentoo.org> -omniORB-4.1.4-r1.ebuild:
+  Drop old
 
   17 May 2015; Pacho Ramos <pacho@gentoo.org> omniORB-4.1.4-r2.ebuild:
   ppc64 stable wrt bug #549246
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index df2edef8586b..371eedfcc325 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,19 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ldflags.patch 452 SHA256 d02d4ba72a5995b07a4189e28deaba25c3733e8639b682d5cee4b36180fc9bee SHA512 472d66b3071de94d4753773092c4781f5b4419041dc23b777bc13e8e4f4a1a40f245931479fc294c43a9e73f322e93b2055fb52a1070423d58dd32f23b0f61ca WHIRLPOOL ab8e25bab496c7c4e5408135500e1cae0366ed0a2698310040071ea27c94020df77b92e21907ea5637b6716093f6108eed594e36dc36bc6d71a99d1b7557a21a
 AUX omniNames 677 SHA256 8ea4e77213e91d62dd5d46eaa883f4e235d0cc6778511c3b5ccd006703ee95ed SHA512 54dc713333fddc85b6d05260932db72cd47b4bb932390fe8f8e3179de35fcd3f0c6c6115f6e2f0be567aa2f7a65eacf57f7afa0bf28e87030dd07b486ed2068d WHIRLPOOL 51264f264e1081929aaae6ba61fd0998e13aa5557399f4a50980931ceecadf25ff730ab9211c35801a2c1fa4fa2994dad5021ded6680261a7b65b351fbeba94a
 AUX omniORB-4.1.4-format-security.patch 557 SHA256 a3169304c555b99591c576e745ad5b4717afaf20e02643fef0336578048e000b SHA512 f2d9ca53f9dcdac7fc0224e435ee7d4eecaf5c948d406f94e81a9ae7770d192b18e846ddd245c5b74e77efb7030902b9f2817b13349f2a685caadb05633e14ee WHIRLPOOL ae7232efd23340f47d12de69ebc4249e5b7b61d7cbc6e248e6dce327b6e524393eeb7a6577d4ccada85a6e5c06ff44ff2991bb5b55c59198ead80e6876d0c670
 AUX omniORB-4.1.4-openssl-1.patch 770 SHA256 0a27f1476347939ba24fce9d0f2e02461644187a8b72ff727d96b3f9a817f623 SHA512 b43adc69ec30a3a1cf6581e050ca93927b267c67623aafdb53db0135a8d4164c779a9d54249c8672e5d8f1c761681092be3c2908cb772820d019db1e2b1ba396 WHIRLPOOL 21d0a2bbe5c8b9ac2aea24e201e7d3090211f45880d5696c61aefe8ccffb68bf2dd168cfbe0c67c7a310ab8a24b3202e112003b2bdd35bba070f2d90b8939e21
 DIST omniORB-4.1.4.tar.gz 3093814 SHA256 84fb9790c25d6e46248c9773747e393b429573190da2150850d4a49debda4e8e SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c WHIRLPOOL 16b12ade124e62b57d8401c73975a4a0861166f080b0f735e7ad363dca1a7387d807e5c8bf4ae9b90b70f41a03e9811109bcb917e78b833578e891b78c9da55f
-EBUILD omniORB-4.1.4-r1.ebuild 2472 SHA256 93652217e5cd018326cbfc9d55ba187458169b39d8f61d95713ebb6e1ba83601 SHA512 693442495b84d646eae2651e6385fd602d438a58355c1869c93b98c136b88cd3d6c856439c197c9f913d770a21c613b5569beece98b72cae7da3b2fa128c8d25 WHIRLPOOL 357fc43e695236a0f4aa0e99cf6e12be6d7daf1c5fd779ad0b42b69a19a27f3e096fe20f4c2c732cb63c974a106e0c94a117fdfbcc3f85263b09cc3462180cdc
 EBUILD omniORB-4.1.4-r2.ebuild 2244 SHA256 49f1719a667bd758790c546158e826248e5daa6912960b5f55da61d4961a7867 SHA512 34add6d896c2da7e4756e5ccb66bd03aa4ac68b524415fd2cce1ff3c7c6c96240f39a46b4ff9c99d5031282a32eb2e63c161f016e5ec4dad0179611ec6b18e5c WHIRLPOOL 6da31e166399965e017149d5ba26e71342eab151b7d74cb7053ffeb1131055fff2003bccbf942bf11cf717a4a000cdee1294477315ef5266e25c50499471ae0b
-MISC ChangeLog 11707 SHA256 0a120bf9713a90f66f5431c1037fb56b5b21e8715792522194c3bf55e4bdd192 SHA512 59b5ff58538cddffa20cc61e34fe052dba2681e16e245ba3e7035872a22570e142518ecda614ba669ff2e7813cbbab6974342bb87dcd3d2f7a9b7ff8eff24487 WHIRLPOOL ca12be696c6ed05dc7eb89305fba7e67a9511118c20a363f4f6452d7a0a3a0789e0df64b174ff845e19c8404c78988fc978441d4841cc96b04fa55908db301f5
+MISC ChangeLog 11791 SHA256 e3aebbf94416d2b2da1a40fae1993cafa19ecec2538bcbf15eb1c0ca9095ef3a SHA512 f0981e39ac1f2e4c61022f3c53ac9ab83d2d4828ca34c87048816f51bfe48b0de744aec3b35f3ede29f24e2290d8c6d8b9daed212a51431fe13742fcdfabf487 WHIRLPOOL 270d919bd2a0ad6ada2bd170bf24f6ec0fbf4620a0f7af404c91c0b11613cb28985d047f340187b80ed2e18341bf19ba253eb79f8259fb6fc98afff5550f5a5d
 MISC metadata.xml 207 SHA256 18888d950e65829e52ee5b469eeff81ee620812b80b8d2850ae87c776e59241a SHA512 db557ebf2598d640d7c211ae896d8a9d337e1a8f440118df9c5593cd405309faef24b0017dc9969c0c28eb047f237bacf57f59bbea008230aaf97ce7a9cadd00 WHIRLPOOL 60ac4459f2a5e88b41e326eaf17503ee5089992be6d648dc503ff52b6543f5778b1b06fd177a9e5bf907b98ab0499f549f64b05a536ecb3252c257645fda1fba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVY+A8ACgkQCaWpQKGI+9SUEgCfd4/PWPWTgU39NrHIRCAgRMWf
-MKkAn3QoCgZ3JzUsy5cIywfjMa04O0yy
-=D/A2
+iQJ8BAEBCgBmBQJVWYc5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCNgP/1ORA6WZ3CZvNHM6dicfVL2s
+Xgf7K182lh9m/3lHFALumUT7XFYJ15B/YCER5AcRlNPuX6vHdN72d3jA2KqnYNmu
+3gtxxn0v7J9hQgzSNkNTQ9JdjQJ1L7HbSSn4KjKbLQJa5WvgxDssi/khPL6abTqH
+ak+lqcd85fmD1+I6FUBqiDmnkRkCUhnXnO6YPy4IYIePfRUwp+QwvlL0ATxbWmAV
+oR+vfHwxnr6w2CviH11jixWCB8dZKDaHuccC3lFti3BtEi3bf13jy3vNzrtHp8/t
+wMgXm5SqZ0gavW4Sc63gpsb+8Ihqhe+c/V3PJnOVJzq0YZA/bmzcGALLdKICfAex
++ZPrJ+JLxJGvaFAJIfYV4bZ2d7bb94zcLncH0ZWVBFcq1ioVksJRYPQRc1UXzIDL
+B0GMYQVn160QWScH1pgNPp1XM8fDIWBM+nFTLN5+oTg0EwrlWOs7ctcWgu1lrIe5
+qz7PhZGcBG6Ooany2Ck8xfQPXM5mg5c+nxTqYctE8H5lolecTr3jR2vriMCotbMT
+D/jo2UTq0iDtVFOxr/TDKNn9Vv43uofUcAgY0bfcgzPDCnlFJ6vBWKmWZ9FFLBbT
+JyDTGxL1pmC5ks4D0+nz+BDWaPA3GKzTn492lHQKjTdvsiqjDnDXCWShTf3iC7zG
+gi6ilgjjz5MLcKMXSh7p
+=QUeH
 -----END PGP SIGNATURE-----
diff --git a/net-misc/omniORB/omniORB-4.1.4-r1.ebuild b/net-misc/omniORB/omniORB-4.1.4-r1.ebuild
deleted file mode 100644
index 5bd786ec292e..000000000000
--- a/net-misc/omniORB/omniORB-4.1.4-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r1.ebuild,v 1.8 2015/04/08 09:25:31 jlec Exp $
-
-EAPI="3"
-
-# 2.5 is problematic due to bug #261330
-PYTHON_DEPEND="2:2.7"
-
-inherit python eutils multilib
-
-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"
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b:0 )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# respect ldflags, bug #284191
-	epatch "${FILESDIR}"/ldflags.patch \
-		"${FILESDIR}"/${P}-openssl-1.patch
-
-	sed -i -e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
-		-e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
-		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"
-
-	PYTHON="$(PYTHON -a)" ECONF_SOURCE=".." econf ${MY_CONF}
-}
-
-src_compile() {
-	cd build || die
-	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	cd build || die
-	emake DESTDIR="${D}" install || die "emake install failed"
-	# this looks redundant
-	rm "${D}/usr/bin/omniidlrun.py" || die
-
-	cd "${S}"
-	dodoc COPYING* CREDITS README* ReleaseNotes* || die
-
-	if use doc; then
-		dohtml doc/*.html || die
-		dohtml -r doc/omniORB || die
-		docinto print
-		dodoc doc/*.pdf || die
-	fi
-
-	dodir /etc/env.d/
-	cat <<- EOF > "${T}/90omniORB"
-		PATH="/usr/share/omniORB/bin/scripts"
-		OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
-	EOF
-	doenvd "${T}/90omniORB" || die
-	doinitd "${FILESDIR}"/omniNames || die
-
-	cp "sample.cfg" "${T}/omniORB.cfg" || die
-	cat <<- EOF >> "${T}/omniORB.cfg"
-		# resolve the omniNames running on localhost
-		InitRef = NameService=corbaname::localhost
-	EOF
-	dodir /etc/omniorb
-	insinto /etc/omniorb
-	doins "${T}/omniORB.cfg" || die
-
-	keepdir /var/log/omniORB
-}
-
-pkg_postinst() {
-	elog "Since 4.1.2, the omniORB init script has been renamed to omniNames for clarity."
-	python_mod_optimize omniidl omniidl_be
-}
-
-pkg_postrm() {
-	python_mod_cleanup omniidl omniidl_be
-}