ppc64 stable wrt #322295

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 9 insertions, 92 deletions

diff --git a/net-misc/omniORB/ChangeLog b/net-misc/omniORB/ChangeLog
index 7628f85b4f03..a36963e3160e 100644
--- a/net-misc/omniORB/ChangeLog
+++ b/net-misc/omniORB/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/omniORB
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.69 2010/07/11 04:18:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.70 2010/07/21 20:25:18 ssuominen Exp $
+
+  21 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  omniORB-4.1.4-r1.ebuild:
+  ppc64 stable wrt #322295
 
   11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   files/omniORB-4.1.4-openssl-1.patch:
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 0dbaf1a5ed28..48ff113ad452 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -2,7 +2,6 @@ AUX ldflags.patch 452 RMD160 b6ae2124dbb412a61e31cc82048065ccec058258 SHA1 b7b08
 AUX omniNames 677 RMD160 7c75795fa9b4808069060728a0404d6ed1138f78 SHA1 7e5f343aaac339cd84eccb70c17b06b86604d436 SHA256 8ea4e77213e91d62dd5d46eaa883f4e235d0cc6778511c3b5ccd006703ee95ed
 AUX omniORB-4.1.4-openssl-1.patch 770 RMD160 f4842ad2b8fc3ed597fee0386f6f783fb8a00ecf SHA1 59c3fc20f08e6aa9e5db1b034a90e9fa897c2676 SHA256 0a27f1476347939ba24fce9d0f2e02461644187a8b72ff727d96b3f9a817f623
 DIST omniORB-4.1.4.tar.gz 3093814 RMD160 b84131230c59b1cef8f714ff1545e44f6779ade1 SHA1 7150d999bcef10c6c3cb24725386497c3f338aa1 SHA256 84fb9790c25d6e46248c9773747e393b429573190da2150850d4a49debda4e8e
-EBUILD omniORB-4.1.4-r1.ebuild 2453 RMD160 b3f5b7faab891315c4c1e309bed394701f65e340 SHA1 73e91c14b5b83d24c1fd7b75337bed43f1de77a8 SHA256 297ea7b693f718955a690b20fdedb907a3f55af5ee00f6715ffe0d0bc1895bb7
-EBUILD omniORB-4.1.4.ebuild 2235 RMD160 47f7def47d1471a3f1f9c518c31d09c208d583f5 SHA1 f7eac82b5109e9b211356deed86d6addfaab1fda SHA256 d9fe0d28039d6fccd8ba2036ed71c87e233a0da6a9798b28936a9a9fa8182cab
-MISC ChangeLog 10821 RMD160 59d44eadccfa6e49ac2cc64f489f573747a5178a SHA1 ad1d5db97a3d43573581cda7ebb6a0f26d281f22 SHA256 09970ea0137374963f6b39e5bd0e57274cace765d57922d45a0b5e9b56606ac8
+EBUILD omniORB-4.1.4-r1.ebuild 2452 RMD160 2f0a4ee120af5508533855a08ead5e4beae814f3 SHA1 3f3756addbe2695b0ba8273fb582950cb6b18797 SHA256 9a909185c7c940927d055c8e244a2307d0a3c88d821601ea020edecb575bdfe7
+MISC ChangeLog 10930 RMD160 8b805406fe3a4d2b0bacc5fd895a389e4921f357 SHA1 4f40ee68d0d73e2d32f6562b49250f292d053279 SHA256 6023f6031c5ed215ca2c0a6db4e136077da1b0ffb3eaeabb00bf69a4ce0fcf8b
 MISC metadata.xml 225 RMD160 106c8f5ff0028efc2beb2d1d065d08e3de1941e3 SHA1 39b11879fb0385ec1afee3995b2d04ba5489f867 SHA256 f27264dffc823378b544553a8bde8fa711cdbd8f06750cc02a4714705e2c81a0
diff --git a/net-misc/omniORB/omniORB-4.1.4-r1.ebuild b/net-misc/omniORB/omniORB-4.1.4-r1.ebuild
index c56c42065c2b..4eccf9518f10 100644
--- a/net-misc/omniORB/omniORB-4.1.4-r1.ebuild
+++ b/net-misc/omniORB/omniORB-4.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.5 2010/07/11 03:26:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r1.ebuild,v 1.6 2010/07/21 20:25:18 ssuominen Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://omniorb.sourceforge.net/"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="doc ssl"
 
 RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )"
diff --git a/net-misc/omniORB/omniORB-4.1.4.ebuild b/net-misc/omniORB/omniORB-4.1.4.ebuild
deleted file mode 100644
index 830050efcf34..000000000000
--- a/net-misc/omniORB/omniORB-4.1.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.11 2010/06/19 15:34:04 arfrever Exp $
-
-EAPI="2"
-
-inherit python eutils
-
-DESCRIPTION="A robust, high-performance CORBA 2 ORB"
-SRC_URI="mirror://sourceforge/omniorb/${PF}.tar.gz"
-HOMEPAGE="http://omniorb.sourceforge.net/"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="doc ssl"
-
-RDEPEND="dev-lang/python
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	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
-	emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install () {
-	cd build
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	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 $(python_get_sitedir)/{omniidl,omniidl_be}
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/{omniidl,omniidl_be}
-}