Remove old.

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

6 files changed, 7 insertions, 362 deletions

diff --git a/net-misc/omniORB/ChangeLog b/net-misc/omniORB/ChangeLog
index f8635d545e9c..f1d6ded4f857 100644
--- a/net-misc/omniORB/ChangeLog
+++ b/net-misc/omniORB/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/omniORB
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.60 2009/12/15 19:19:43 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.61 2010/04/23 20:04:01 caster Exp $
+
+  23 Apr 2010; Vlastimil Babka <caster@gentoo.org> -files/omniORB-4.0.0,
+  -omniORB-4.0.5.ebuild, -omniORB-4.1.2.ebuild, -omniORB-4.1.3.ebuild,
+  -files/omniORB-4.1.3-glibc-2.10.patch:
+  Remove old.
 
   15 Dec 2009; Raúl Porcel <armin76@gentoo.org> omniORB-4.0.5.ebuild,
   omniORB-4.1.2.ebuild, omniORB-4.1.3.ebuild, omniORB-4.1.4.ebuild:
diff --git a/net-misc/omniORB/files/omniORB-4.0.0 b/net-misc/omniORB/files/omniORB-4.0.0
deleted file mode 100644
index e86c73c59d8f..000000000000
--- a/net-misc/omniORB/files/omniORB-4.0.0
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/files/omniORB-4.0.0,v 1.4 2004/07/15 00:07:09 agriffis Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	if [ ! -d "/var/log/omniORB" ] ; then
-		install -d /var/log/omniORB
-	fi
-	if [ "/var/log/omniORB/omninames*" ] ; then
-		rm -f /var/log/omniORB/omninames*
-	fi
-	ebegin "Starting omniORB"
-	exec /usr/bin/omniNames -start 2809 -logdir /var/log/omniORB \
-		-errlog /var/log/omniORB/omniORB.errors 1>&2 &
-	eend $? "Error starting omniORB."
-}
-
-stop() {
-	ebegin "Stopping omniORB"
-	killall omniNames 1>&2
-	eend $? "Error stopping omniORB."
-}
diff --git a/net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch b/net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch
deleted file mode 100644
index 5eb702c9d08d..000000000000
--- a/net-misc/omniORB/files/omniORB-4.1.3-glibc-2.10.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -NrU5 omniORB-4.1.3.original/src/appl/utils/catior/catior.cc omniORB-4.1.3/src/appl/utils/catior/catior.cc
---- omniORB-4.1.3.original/src/appl/utils/catior/catior.cc	2009-06-11 15:09:32.000000000 +0000
-+++ omniORB-4.1.3/src/appl/utils/catior/catior.cc	2009-06-11 15:20:45.000000000 +0000
-@@ -358,11 +358,11 @@
- 
-   int c;
-   int hexflag = 0;
-   int omniflag = 0;
- 
--  while((c = getopt(argc,argv,"xo")) != EOF) {
-+  while((c = getopt(argc,argv,"xo")) != -1) {
-     switch(c) {
-     case 'x':
-       hexflag = 1;
-       break;
-     case 'o':
-diff -NrU5 omniORB-4.1.3.original/src/appl/utils/convertior/convertior.cc omniORB-4.1.3/src/appl/utils/convertior/convertior.cc
---- omniORB-4.1.3.original/src/appl/utils/convertior/convertior.cc	2009-06-11 15:09:32.000000000 +0000
-+++ omniORB-4.1.3/src/appl/utils/convertior/convertior.cc	2009-06-11 15:21:11.000000000 +0000
-@@ -148,11 +148,11 @@
- 
-   // Get options:
- 
-   int c;
- 
--  while((c = getopt(argc,argv,"x")) != EOF)
-+  while((c = getopt(argc,argv,"x")) != -1)
-     {
-       switch(c)
- 	{
- 	case '?':
- 	case 'h':
-diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/def.h omniORB-4.1.3/src/tool/omkdepend/def.h
---- omniORB-4.1.3.original/src/tool/omkdepend/def.h	2009-06-11 15:09:32.000000000 +0000
-+++ omniORB-4.1.3/src/tool/omkdepend/def.h	2009-06-11 15:21:34.000000000 +0000
-@@ -126,11 +126,11 @@
- char			*realloc();
- #endif
- 
- char			*copy();
- char			*base_name();
--char			*getline();
-+char			*get_line();
- struct symtab		*slookup();
- struct symtab		*isdefined();
- struct symtab		*fdefined();
- struct filepointer	*getfile();
- struct inclist		*newinclude();
-diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/main.c omniORB-4.1.3/src/tool/omkdepend/main.c
---- omniORB-4.1.3.original/src/tool/omkdepend/main.c	2009-06-11 15:09:32.000000000 +0000
-+++ omniORB-4.1.3/src/tool/omkdepend/main.c	2009-06-11 15:22:23.000000000 +0000
-@@ -467,11 +467,11 @@
- 
- /*
-  * Get the next line.  We only return lines beginning with '#' since that
-  * is all this program is ever interested in.
-  */
--char *getline(filep)
-+char *get_line(filep)
- 	register struct filepointer	*filep;
- {
- 	register char	*p,	/* walking pointer */
- 			*eof,	/* end of file pointer */
- 			*bol;	/* beginning of line pointer */
-diff -NrU5 omniORB-4.1.3.original/src/tool/omkdepend/parse.c omniORB-4.1.3/src/tool/omkdepend/parse.c
---- omniORB-4.1.3.original/src/tool/omkdepend/parse.c	2009-06-11 15:09:32.000000000 +0000
-+++ omniORB-4.1.3/src/tool/omkdepend/parse.c	2009-06-11 15:23:19.000000000 +0000
-@@ -39,11 +39,11 @@
- {
- 	register char	*line;
- 	register int	type;
- 	boolean recfailOK;
- 
--	while (line = getline(filep)) {
-+	while (line = get_line(filep)) {
- 		switch(type = deftype(line, filep, file_red, file, TRUE)) {
- 		case IF:
- 		doif:
- 			type = find_includes(filep, file,
- 				file_red, recursion+1, failOK);
-@@ -164,11 +164,11 @@
- 	struct inclist		*file, *file_red;
- {
- 	register char	*line;
- 	register int	type;
- 
--	while (line = getline(filep)) {
-+	while (line = get_line(filep)) {
- 		switch(type = deftype(line, filep, file_red, file, FALSE)) {
- 		case IF:
- 		case IFFALSE:
- 		case IFGUESSFALSE:
- 		case IFDEF:
diff --git a/net-misc/omniORB/omniORB-4.0.5.ebuild b/net-misc/omniORB/omniORB-4.0.5.ebuild
deleted file mode 100644
index be4c2dd4c5b0..000000000000
--- a/net-misc/omniORB/omniORB-4.0.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.0.5.ebuild,v 1.11 2009/12/15 19:19:43 armin76 Exp $
-
-DESCRIPTION="A robust, high-performance CORBA 2 ORB"
-SRC_URI="mirror://sourceforge/omniorb/${PF}.tar.gz"
-HOMEPAGE="http://omniorb.sourceforge.net/"
-
-IUSE="ssl"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DEPEND="dev-lang/python
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
-		-e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \
-		${S}/mk/beforeauto.mk.in \
-		${S}/mk/platforms/i586_linux_2.0_*.mk
-}
-
-src_compile() {
-	cd ${S}
-
-	mkdir ${S}/build
-	cd ${S}/build
-
-	MY_CONF="--prefix=/usr --with-omniORB-config=/etc/omniorb/omniORB.cfg --with-omniNames-logdir=/var/log/omniORB"
-
-	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
-
-	MY_PY=/usr/bin/python`python -c "import sys; print sys.version[:3]"`
-
-	PYTHON=${MY_PY} ../configure ${MY_CONF} || die "./configure failed"
-	emake || die "make failed"
-}
-
-src_install () {
-
-	cd ${S}/build
-	emake DESTDIR=${D} install
-
-	cd ${S}
-	dodoc COPYING* CREDITS README* ReleaseNotes*
-
-	cd ${S}/doc
-	docinto print
-	dodoc *.ps
-	dodoc *.tex
-	dodoc *.pdf
-
-	dodir /etc/env.d/
-	echo "PATH=/usr/share/omniORB/bin/scripts" > ${D}/etc/env.d/90omniORB
-	echo "OMNIORB_CONFIG=/etc/omniorb/omniORB.cfg" >> ${D}/etc/env.d/90omniORB
-	newinitd ${FILESDIR}/omniORB-4.0.0 omniORB
-
-	cp ${S}/sample.cfg ${S}/omniORB.cfg
-	dodir /etc/omniorb
-	insinto /etc/omniorb
-	doins ${S}/omniORB.cfg
-
-}
-
-pkg_postinst() {
-	echo "Performing post-installation routines for ${P}."
-
-	if [ ! -f "${ROOT}etc/omniorb/omniORB.cfg" ] ; then
-		echo "ORBInitialHost `uname -n`" > ${ROOT}etc/omniorb/omniORB.cfg
-		echo "ORBInitialPort 2809" >> ${ROOT}etc/omniorb/omniORB.cfg
-	fi
-	#/usr/bin/python ${ROOT}usr/share/doc/${PF}/mkomnistubs.py
-}
diff --git a/net-misc/omniORB/omniORB-4.1.2.ebuild b/net-misc/omniORB/omniORB-4.1.2.ebuild
deleted file mode 100644
index a5e821845679..000000000000
--- a/net-misc/omniORB/omniORB-4.1.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.2.ebuild,v 1.3 2009/12/15 19:19:43 armin76 Exp $
-
-inherit python eutils
-
-DESCRIPTION="A robust, high-performance CORBA 2 ORB"
-SRC_URI="mirror://sourceforge/omniorb/${PF}.tar.gz"
-HOMEPAGE="http://omniorb.sourceforge.net/"
-
-IUSE="ssl"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="dev-lang/python
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
-		-e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \
-		mk/beforeauto.mk.in \
-		mk/platforms/i586_linux_2.0_*.mk || die "sed failed"
-}
-
-src_compile() {
-	mkdir build || die
-	cd build
-
-	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_version
-	PYTHON=/usr/bin/python${PYVER} ../configure ${MY_CONF} \
-		|| die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install () {
-	cd "${S}/build"
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	cd "${S}"
-	dodoc COPYING* CREDITS README* ReleaseNotes* || die
-
-	docinto print
-	dodoc doc/*.ps doc/*.pdf || die
-
-	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
-}
-
-src_postinst() {
-	elog "Since 4.1.2, the omniORB init script has been renamed to omniNames for clarity."
-}
diff --git a/net-misc/omniORB/omniORB-4.1.3.ebuild b/net-misc/omniORB/omniORB-4.1.3.ebuild
deleted file mode 100644
index 202b3f326ed6..000000000000
--- a/net-misc/omniORB/omniORB-4.1.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.3.ebuild,v 1.4 2009/12/15 19:19:43 armin76 Exp $
-
-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="ssl"
-
-RDEPEND="dev-lang/python
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-glibc-2.10.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_compile() {
-	mkdir build || die
-	cd build
-
-	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_version
-	PYTHON=/usr/bin/python${PYVER} ECONF_SOURCE=".." econf ${MY_CONF} \
-		|| die "./configure failed"
-
-	emake OPTCFLAGS="${OPTCFLAGS}" OPTCXXFLAGS="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install () {
-	cd "${S}/build"
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	cd "${S}"
-	dodoc COPYING* CREDITS README* ReleaseNotes* || die
-
-	docinto print
-	dodoc doc/*.ps doc/*.pdf || die
-
-	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 "/usr/$(get_libdir)/python${PYVER}/site-packages/omniidl"
-	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages/omniidl_be"
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}