ppc64 stable wrt #322295

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 7 insertions, 89 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/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}
-}