jlec 15/04/08 09:25:31 Modified: metadata.xml omniORB-4.1.4-r1.ebuild ChangeLog Added: omniORB-4.1.4-r2.ebuild Log: Bump EAPI and python support; fix for format-security, bug #520590 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.7 net-misc/omniORB/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/omniORB/metadata.xml?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/omniORB/metadata.xml?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/omniORB/metadata.xml?r1=1.6&r2=1.7 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/omniORB/metadata.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- metadata.xml 24 Sep 2011 10:09:56 -0000 1.6 +++ metadata.xml 8 Apr 2015 09:25:31 -0000 1.7 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer> - <email>[email protected]</email> - </maintainer> + <maintainer> + <email>[email protected]</email> + </maintainer> </pkgmetadata> 1.8 net-misc/omniORB/omniORB-4.1.4-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r1.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r1.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r1.ebuild?r1=1.7&r2=1.8 Index: omniORB-4.1.4-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r1.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- omniORB-4.1.4-r1.ebuild 5 Feb 2012 01:53:54 -0000 1.7 +++ omniORB-4.1.4-r1.ebuild 8 Apr 2015 09:25:31 -0000 1.8 @@ -1,24 +1,24 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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.7 2012/02/05 01:53:54 floppym Exp $ +# $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.6" +PYTHON_DEPEND="2:2.7" inherit python eutils multilib DESCRIPTION="A robust, high-performance CORBA 2 ORB" -SRC_URI="mirror://sourceforge/omniorb/${P}.tar.gz" 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 )" +RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b:0 )" DEPEND="${RDEPEND}" pkg_setup() { @@ -48,12 +48,12 @@ } src_compile() { - cd build + cd build || die emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}" || die "emake failed" } src_install() { - cd build + cd build || die emake DESTDIR="${D}" install || die "emake install failed" # this looks redundant rm "${D}/usr/bin/omniidlrun.py" || die 1.72 net-misc/omniORB/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/omniORB/ChangeLog?rev=1.72&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/omniORB/ChangeLog?rev=1.72&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/omniORB/ChangeLog?r1=1.71&r2=1.72 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- ChangeLog 5 Feb 2012 01:53:54 -0000 1.71 +++ ChangeLog 8 Apr 2015 09:25:31 -0000 1.72 @@ -1,6 +1,13 @@ # ChangeLog for net-misc/omniORB -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.71 2012/02/05 01:53:54 floppym Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.72 2015/04/08 09:25:31 jlec Exp $ + +*omniORB-4.1.4-r2 (08 Apr 2015) + + 08 Apr 2015; Justin Lecher <[email protected]> + +files/omniORB-4.1.4-format-security.patch, +omniORB-4.1.4-r2.ebuild, + metadata.xml, omniORB-4.1.4-r1.ebuild: + Bump EAPI and python support; fix for format-security, bug #520590 05 Feb 2012; Mike Gilbert <[email protected]> omniORB-4.1.4-r1.ebuild: Inherit multilib. @@ -301,4 +308,3 @@ 09 Jul 2002; phoen][x <[email protected]> omniORB-304.ebuild : Added KEYWORDS, LICENSE, SLOT. - 1.1 net-misc/omniORB/omniORB-4.1.4-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r2.ebuild?rev=1.1&content-type=text/plain Index: omniORB-4.1.4-r2.ebuild =================================================================== # 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-r2.ebuild,v 1.1 2015/04/08 09:25:31 jlec Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) inherit eutils multilib python-single-r1 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 static-libs" RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b:0= )" DEPEND="${RDEPEND}" src_prepare() { # respect ldflags, bug #284191 epatch \ "${FILESDIR}"/ldflags.patch \ "${FILESDIR}"/${P}-openssl-1.patch \ "${FILESDIR}"/${P}-format-security.patch sed \ -e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \ -e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \ -i 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" ECONF_SOURCE=".." econf ${MY_CONF} $(use_enable static-libs static) } src_compile() { cd build || die emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}" } src_install() { cd build || die default # this looks redundant rm "${ED}/usr/bin/omniidlrun.py" || die cd "${S}" || die if use doc; then dohtml doc/*.html dohtml -r doc/omniORB docinto print dodoc doc/*.pdf fi cat <<- EOF > "${T}/90omniORB" PATH="/usr/share/omniORB/bin/scripts" OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg" EOF doenvd "${T}/90omniORB" doinitd "${FILESDIR}"/omniNames cp "sample.cfg" "${T}/omniORB.cfg" || die cat <<- EOF >> "${T}/omniORB.cfg" # resolve the omniNames running on localhost InitRef = NameService=corbaname::localhost EOF insinto /etc/omniorb doins "${T}"/omniORB.cfg keepdir /var/log/omniORB python_optimize python_fix_shebang "${ED}"/usr/bin/omniidl } pkg_postinst() { elog "Since 4.1.2, the omniORB init script has been renamed to omniNames for clarity." }
