Version bump, bug #214308. Fix multilib-strict and quoting, thanks to gentoofan23, bug #214306. Rename omniORB init script to omniNames for clarity and rewrite it with s-s-d. Point the naming service to localhost in omniORB.cfg to work out of the box. Add myself as maintainer.

Package-Manager: portage-2.1.4.4

5 files changed, 117 insertions, 5 deletions

diff --git a/net-misc/omniORB/ChangeLog b/net-misc/omniORB/ChangeLog
index ba6a6a39a0ec..a4e111c7a742 100644
--- a/net-misc/omniORB/ChangeLog
+++ b/net-misc/omniORB/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/omniORB
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.48 2007/11/03 17:05:46 caleb Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.49 2008/04/02 21:20:13 caster Exp $
+
+*omniORB-4.1.2 (02 Apr 2008)
+
+  02 Apr 2008; Vlastimil Babka <caster@gentoo.org> +files/omniNames,
+  metadata.xml, +omniORB-4.1.2.ebuild:
+  Version bump, bug #214308. Fix multilib-strict and quoting, thanks to
+  gentoofan23, bug #214306. Rename omniORB init script to omniNames for
+  clarity and rewrite it with s-s-d. Point the naming service to localhost
+  in omniORB.cfg to work out of the box. Add myself as maintainer.
 
   03 Nov 2007; Caleb Tennis <caleb@gentoo.org> -omniORB-4.0.6.ebuild,
   -omniORB-4.0.7.ebuild:
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 3fa8de7e9af1..d7c85ac5a264 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,10 +1,13 @@
 AUX mkomnistubs.py 630 RMD160 05a0a85f7bb3af526a250a1fab1b9c9fe9f6ce02 SHA1 f22b4b9453ded18e263c011d06dc2d70d9e00660 SHA256 826874667a1b9cd1b559ede9276110c6fb7f564ba81d63609182f2bd08c2e4a0
+AUX omniNames 677 RMD160 7c75795fa9b4808069060728a0404d6ed1138f78 SHA1 7e5f343aaac339cd84eccb70c17b06b86604d436 SHA256 8ea4e77213e91d62dd5d46eaa883f4e235d0cc6778511c3b5ccd006703ee95ed
 AUX omniORB-4.0.0 706 RMD160 441abb40fdd55b0b0f4254f390f1487ee93fa6d1 SHA1 2c07973961ccef4c41641a408c0f29386706b120 SHA256 646f43fdecb15f3ce17477f21928442bc0ca4c80f7f73e0a6619d087dc06edf5
 DIST omniORB-4.0.5.tar.gz 2769030 RMD160 3a14a84342ee7fb53215f766572053233148578f SHA1 e43f9f4946bc7be3fad086dbe8f959287bea94e6 SHA256 a9e5be85d85a7fa71a078069c724f92cb3de02c001cee83944f4e6286581515c
 DIST omniORB-4.1.0.tar.gz 3069048 RMD160 13c2b82fcecd93491ecfd776390118fd95e88fb7 SHA1 5147d869567887c0802462c78369bc0b02df7694 SHA256 8fd472684cd256067ef76d78a12169f3735ffe4413f70f439099c16a21a4eb82
 DIST omniORB-4.1.1.tar.gz 3183418 RMD160 5fba9144ae17ac6ab2cd1f96664af20d6e1f8911 SHA1 67a4e5927b83330c4031c677d3e269f2c755efe3 SHA256 1e2e2de5e37b951b7a313de909b0d14ec65d6a41fb3bc64b8fefdbb31ba2210b
+DIST omniORB-4.1.2.tar.gz 3202157 RMD160 faf72e6bd775a2640530a188f31e0b0474626488 SHA1 6c5f7bd4c82865f921a8a9bec1e3f57dfb529eeb SHA256 7b905e1cdd73046f1592dcd7932d8ec262df94119a22c5ede0dc877470cc12b4
 EBUILD omniORB-4.0.5.ebuild 1960 RMD160 8879842dd545ab10f164864e8090472cc14c1068 SHA1 5e0eae55d5fe33a1aaca4404dc9c1e735fdf9499 SHA256 edd56499c0d5410d785e56571d0beec943551ee1249c367606ab94149f58fa68
 EBUILD omniORB-4.1.0.ebuild 1981 RMD160 f6f3b08edd265a6c150e9cdeaeb7bcdc3a380df8 SHA1 95275c3e9616942add80bbda77d419f4e5e4ef8c SHA256 8b8efda5bc76f9ca2a379756c62cbf7a248f02ad38139a31a184f650de923baf
 EBUILD omniORB-4.1.1.ebuild 1946 RMD160 8e2283b77b59bb5e54a629225f35dc0145b1426b SHA1 6fbde91edf10420f54ac2f0e38f630218d295edc SHA256 fbbcea0cf80a988b58bfa8c2eddbdbc7e6996efe5fe5da2aa60e96bf0e2682fe
-MISC ChangeLog 7537 RMD160 a774079566bc55d1e83ad3e8d466b6f75b597dfa SHA1 03fc71800f142068d993e3dddd56f3cb719184a7 SHA256 bdbc24b81be843dedd7c4f621334c7b37ddfdd462346e0fc3a67307498f54bc6
-MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+EBUILD omniORB-4.1.2.ebuild 1983 RMD160 0dfa720fb79a1e0e0303a33307f6aa77060f8de1 SHA1 4c058a93b3b312fc5a9c72e9ef64249d485e0f52 SHA256 c7447c24aec62e7f78dcade901dad7e1b5c3fcc4a693f512b8ca1e7bf92484b4
+MISC ChangeLog 7963 RMD160 55ee5ac159c7e926bb670b9d6c1749c36c14260a SHA1 41a11b790c9fb4854df0b9cccbb448114e26f1e0 SHA256 7a66814d1bcce84cb788638a098d3c6db7a870240fbc642bf46b6cfc01426424
+MISC metadata.xml 225 RMD160 106c8f5ff0028efc2beb2d1d065d08e3de1941e3 SHA1 39b11879fb0385ec1afee3995b2d04ba5489f867 SHA256 f27264dffc823378b544553a8bde8fa711cdbd8f06750cc02a4714705e2c81a0
diff --git a/net-misc/omniORB/files/omniNames b/net-misc/omniORB/files/omniNames
new file mode 100644
index 000000000000..aa49fd9dcc40
--- /dev/null
+++ b/net-misc/omniORB/files/omniNames
@@ -0,0 +1,22 @@
+#!/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/omniNames,v 1.1 2008/04/02 21:20:14 caster Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting omniNames"
+	start-stop-daemon --start --background --make-pidfile --pidfile /var/run/omniNames.pid \
+		--exec /usr/bin/omniNames -- -start -always -logdir /var/log/omniORB \
+		-errlog /var/log/omniORB/omniORB.errors
+	eend $? "Error starting omniNames."
+}
+
+stop() {
+	ebegin "Stopping omniNames"
+	start-stop-daemon --stop --pidfile /var/run/omniNames.pid
+	eend $? "Error stopping omniNames."
+}
diff --git a/net-misc/omniORB/metadata.xml b/net-misc/omniORB/metadata.xml
index 9f3fdee2246b..d57d8cff9f6e 100644
--- a/net-misc/omniORB/metadata.xml
+++ b/net-misc/omniORB/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>caster@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/omniORB/omniORB-4.1.2.ebuild b/net-misc/omniORB/omniORB-4.1.2.ebuild
new file mode 100644
index 000000000000..13122fc5f21a
--- /dev/null
+++ b/net-misc/omniORB/omniORB-4.1.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2008 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.1 2008/04/02 21:20:13 caster 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="~alpha ~amd64 ~ia64 ~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."
+}