From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A27841381F3 for ; Fri, 14 Jun 2013 11:21:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A4C3E09AF; Fri, 14 Jun 2013 11:21:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0DD10E099F for ; Fri, 14 Jun 2013 11:21:34 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3D6633E4A5 for ; Fri, 14 Jun 2013 11:21:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0E98CE5466 for ; Fri, 14 Jun 2013 11:21:32 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1371207390.ee9883074d40ae698fa977d34ebd00be663a7723.jlec@gentoo> Subject: [gentoo-commits] proj/sci:fixing commit in: dev-python/omniorbpy/ X-VCS-Repository: proj/sci X-VCS-Files: dev-python/omniorbpy/ChangeLog dev-python/omniorbpy/metadata.xml dev-python/omniorbpy/omniorbpy-3.4.ebuild X-VCS-Directories: dev-python/omniorbpy/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: ee9883074d40ae698fa977d34ebd00be663a7723 X-VCS-Branch: fixing Date: Fri, 14 Jun 2013 11:21:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c9c481aa-42bc-4821-bc0f-757bc2722023 X-Archives-Hash: d1557bf0ad695b5ee06095b60b9d422a commit: ee9883074d40ae698fa977d34ebd00be663a7723 Author: Justin Lecher gentoo org> AuthorDate: Fri Jun 14 10:56:30 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Jun 14 10:56:30 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ee988307 dev-python/omniorbpy: Bump to EAPI=5 and distutils-r1.eclass Package-Manager: portage-2.2.0_alpha179 --- dev-python/omniorbpy/ChangeLog | 6 ++- dev-python/omniorbpy/metadata.xml | 2 +- dev-python/omniorbpy/omniorbpy-3.4.ebuild | 90 +++++++++---------------------- 3 files changed, 32 insertions(+), 66 deletions(-) diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog index 945098f..1b9bddb 100644 --- a/dev-python/omniorbpy/ChangeLog +++ b/dev-python/omniorbpy/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for dev-python/omniorbpy -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Jun 2013; Justin Lecher omniorbpy-3.4.ebuild, + metadata.xml: + Bump to EAPI=5 and distutils-r1.eclass + 24 Jun 2011; Justin Lecher omniorbpy-3.4.ebuild: Sort inherit and/or USE diff --git a/dev-python/omniorbpy/metadata.xml b/dev-python/omniorbpy/metadata.xml index d369d06..897aa2e 100644 --- a/dev-python/omniorbpy/metadata.xml +++ b/dev-python/omniorbpy/metadata.xml @@ -1,5 +1,5 @@ - sci + sci diff --git a/dev-python/omniorbpy/omniorbpy-3.4.ebuild b/dev-python/omniorbpy/omniorbpy-3.4.ebuild index d78ffc6..c265e39 100644 --- a/dev-python/omniorbpy/omniorbpy-3.4.ebuild +++ b/dev-python/omniorbpy/omniorbpy-3.4.ebuild @@ -1,18 +1,16 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" +EAPI=5 -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" +PYTHON_COMPAT=( python{2_6,2_7} ) -inherit eutils multilib python +inherit autotools-utils eutils multilib python-r1 MY_P=${P/omniorb/omniORB} -S=${WORKDIR}/${MY_P} -DESCRIPTION="A robust high-performance CORBA ORB for Python." +DESCRIPTION="A robust high-performance CORBA ORB for Python" HOMEPAGE="http://omniorb.sourceforge.net/" SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.gz" @@ -21,83 +19,47 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="ssl" -DEPEND=">=net-misc/omniORB-4.1.3 +DEPEND=" + >=net-misc/omniORB-4.1.3 ssl? ( dev-libs/openssl )" RDEPEND=${DEPEND} -RESTRICT_PYTHON_ABIS="3.*" +S=${WORKDIR}/${MY_P} src_prepare() { - sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \ + sed \ + -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \ -e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \ - "${S}"/mk/beforeauto.mk.in - sed -i -e 's#^.*compileall[^\\]*#${EPREFIX}/bin/true;#' \ - "${S}"/python/dir.mk \ + -e "s/'prefix[\t ]*:= \/usr'/'prefix := \${DESTDIR}\/usr'/" \ + -i "${S}"/mk/beforeauto.mk.in || die + sed \ + -e 's#^.*compileall[^\\]*#${EPREFIX}/bin/true;#' \ + -i "${S}"/python/dir.mk \ "${S}"/python/omniORB/dir.mk \ "${S}"/python/COS/dir.mk \ - "${S}"/python/CosNaming/dir.mk - python_copy_sources + "${S}"/python/CosNaming/dir.mk || die + autotools-utils_src_prepare } src_configure() { - configuration() { - local myconf - use ssl && myconf="${MY_CONF} --with-openssl=${EPREFIX}/usr" + local myeconfargs=( --with-omniorb="${EPREFIX}/usr" ) - PYTHON="$(PYTHON)" econf --with-omniorb="${EPREFIX}"/usr ${myconf} - } - python_execute_function -s configuration + use ssl && myconf+=( --with-openssl="${EPREFIX}/usr" ) + + python_foreach_impl autotools-utils_src_configure } src_compile() { - python_src_compile + python_foreach_impl autotools-utils_src_compile } src_install() { - installation() { - # make files are crap! - sed -i -e "s/'prefix[\t ]*:= \/usr'/'prefix := \${DESTDIR}\/usr'/" \ - mk/beforeauto.mk - - # won't work without these really very ugly hack... - # maybe someone can do better.. - - mv python/omniORB/dir.mk python/omniORB/dir.mk_orig - awk -v STR="ir\\\.idl" '{ if (/^[[:space:]]*$/) flag = 0; tmpstr = $0; if (gsub(STR, "", tmpstr)) flag = 1; if (flag) print "#" $0; else print $0; }' python/omniORB/dir.mk_orig > python/omniORB/dir.mk - - mv python/dir.mk python/dir.mk_orig - awk -v STR="Naming\\\.idl" '{ if (/^[[:space:]]*$/) flag = 0; tmpstr = $0; if (gsub(STR, "", tmpstr)) flag = 1; if (flag) print "#" $0; else print $0; }' python/dir.mk_orig > python/dir.mk - - emake DESTDIR="${D}" install || die "install failed" - - # bug #166738 - mv "${ED}"$(python_get_sitedir)/PortableServer.py \ - "${ED}"$(python_get_sitedir)/omniorbpy_PortableServer.py + python_foreach_impl autotools-utils_src_install - mv "${ED}"$(python_get_sitedir)/CORBA.py \ - "${ED}"$(python_get_sitedir)/omniorbpy_CORBA.py - - rm "${ED}"$(python_get_sitedir)/omniidl_be/__init__.py* - - # fixed the file collision from bug #247851 - rm "${ED}"$(python_get_sitedir)/__init__.py - } - python_execute_function -s installation - - dodoc COPYING.LIB README.txt README.Python || die - dohtml -r doc/omniORBpy || die - dodoc doc/omniORBpy.p* || die # ps,pdf - dodoc doc/tex/* || die # .bib, .tex + dohtml -r doc/omniORBpy + dodoc doc/omniORBpy.p* + dodoc doc/tex/* insinto /usr/share/doc/${PF}/ doins -r examples || die - -} - -pkg_postinst() { - python_mod_optimize $(python_get_sitedir) -} - -pkg_postrm() { - python_mod_cleanup } From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DC5071381F3 for ; Fri, 14 Jun 2013 11:22:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64FDEE09EF; Fri, 14 Jun 2013 11:21:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4E4F3E09EF for ; Fri, 14 Jun 2013 11:21:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C1F033E4DF for ; Fri, 14 Jun 2013 11:21:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D3249E5463 for ; Fri, 14 Jun 2013 11:21:36 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1371207390.ee9883074d40ae698fa977d34ebd00be663a7723.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-python/omniorbpy/ X-VCS-Repository: proj/sci X-VCS-Files: dev-python/omniorbpy/ChangeLog dev-python/omniorbpy/metadata.xml dev-python/omniorbpy/omniorbpy-3.4.ebuild X-VCS-Directories: dev-python/omniorbpy/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: ee9883074d40ae698fa977d34ebd00be663a7723 X-VCS-Branch: master Date: Fri, 14 Jun 2013 11:21:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 332e1d69-ce4f-45be-99f0-8e42303811f6 X-Archives-Hash: 15d965e82e04037efe5530c5b7d99064 Message-ID: <20130614112136.0dUedmFdg2IbTTZTSt4hICvsXqFpqX7vyzMKOj1djMQ@z> commit: ee9883074d40ae698fa977d34ebd00be663a7723 Author: Justin Lecher gentoo org> AuthorDate: Fri Jun 14 10:56:30 2013 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri Jun 14 10:56:30 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ee988307 dev-python/omniorbpy: Bump to EAPI=5 and distutils-r1.eclass Package-Manager: portage-2.2.0_alpha179 --- dev-python/omniorbpy/ChangeLog | 6 ++- dev-python/omniorbpy/metadata.xml | 2 +- dev-python/omniorbpy/omniorbpy-3.4.ebuild | 90 +++++++++---------------------- 3 files changed, 32 insertions(+), 66 deletions(-) diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog index 945098f..1b9bddb 100644 --- a/dev-python/omniorbpy/ChangeLog +++ b/dev-python/omniorbpy/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for dev-python/omniorbpy -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Jun 2013; Justin Lecher omniorbpy-3.4.ebuild, + metadata.xml: + Bump to EAPI=5 and distutils-r1.eclass + 24 Jun 2011; Justin Lecher omniorbpy-3.4.ebuild: Sort inherit and/or USE diff --git a/dev-python/omniorbpy/metadata.xml b/dev-python/omniorbpy/metadata.xml index d369d06..897aa2e 100644 --- a/dev-python/omniorbpy/metadata.xml +++ b/dev-python/omniorbpy/metadata.xml @@ -1,5 +1,5 @@ - sci + sci diff --git a/dev-python/omniorbpy/omniorbpy-3.4.ebuild b/dev-python/omniorbpy/omniorbpy-3.4.ebuild index d78ffc6..c265e39 100644 --- a/dev-python/omniorbpy/omniorbpy-3.4.ebuild +++ b/dev-python/omniorbpy/omniorbpy-3.4.ebuild @@ -1,18 +1,16 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" +EAPI=5 -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" +PYTHON_COMPAT=( python{2_6,2_7} ) -inherit eutils multilib python +inherit autotools-utils eutils multilib python-r1 MY_P=${P/omniorb/omniORB} -S=${WORKDIR}/${MY_P} -DESCRIPTION="A robust high-performance CORBA ORB for Python." +DESCRIPTION="A robust high-performance CORBA ORB for Python" HOMEPAGE="http://omniorb.sourceforge.net/" SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.gz" @@ -21,83 +19,47 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="ssl" -DEPEND=">=net-misc/omniORB-4.1.3 +DEPEND=" + >=net-misc/omniORB-4.1.3 ssl? ( dev-libs/openssl )" RDEPEND=${DEPEND} -RESTRICT_PYTHON_ABIS="3.*" +S=${WORKDIR}/${MY_P} src_prepare() { - sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \ + sed \ + -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \ -e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \ - "${S}"/mk/beforeauto.mk.in - sed -i -e 's#^.*compileall[^\\]*#${EPREFIX}/bin/true;#' \ - "${S}"/python/dir.mk \ + -e "s/'prefix[\t ]*:= \/usr'/'prefix := \${DESTDIR}\/usr'/" \ + -i "${S}"/mk/beforeauto.mk.in || die + sed \ + -e 's#^.*compileall[^\\]*#${EPREFIX}/bin/true;#' \ + -i "${S}"/python/dir.mk \ "${S}"/python/omniORB/dir.mk \ "${S}"/python/COS/dir.mk \ - "${S}"/python/CosNaming/dir.mk - python_copy_sources + "${S}"/python/CosNaming/dir.mk || die + autotools-utils_src_prepare } src_configure() { - configuration() { - local myconf - use ssl && myconf="${MY_CONF} --with-openssl=${EPREFIX}/usr" + local myeconfargs=( --with-omniorb="${EPREFIX}/usr" ) - PYTHON="$(PYTHON)" econf --with-omniorb="${EPREFIX}"/usr ${myconf} - } - python_execute_function -s configuration + use ssl && myconf+=( --with-openssl="${EPREFIX}/usr" ) + + python_foreach_impl autotools-utils_src_configure } src_compile() { - python_src_compile + python_foreach_impl autotools-utils_src_compile } src_install() { - installation() { - # make files are crap! - sed -i -e "s/'prefix[\t ]*:= \/usr'/'prefix := \${DESTDIR}\/usr'/" \ - mk/beforeauto.mk - - # won't work without these really very ugly hack... - # maybe someone can do better.. - - mv python/omniORB/dir.mk python/omniORB/dir.mk_orig - awk -v STR="ir\\\.idl" '{ if (/^[[:space:]]*$/) flag = 0; tmpstr = $0; if (gsub(STR, "", tmpstr)) flag = 1; if (flag) print "#" $0; else print $0; }' python/omniORB/dir.mk_orig > python/omniORB/dir.mk - - mv python/dir.mk python/dir.mk_orig - awk -v STR="Naming\\\.idl" '{ if (/^[[:space:]]*$/) flag = 0; tmpstr = $0; if (gsub(STR, "", tmpstr)) flag = 1; if (flag) print "#" $0; else print $0; }' python/dir.mk_orig > python/dir.mk - - emake DESTDIR="${D}" install || die "install failed" - - # bug #166738 - mv "${ED}"$(python_get_sitedir)/PortableServer.py \ - "${ED}"$(python_get_sitedir)/omniorbpy_PortableServer.py + python_foreach_impl autotools-utils_src_install - mv "${ED}"$(python_get_sitedir)/CORBA.py \ - "${ED}"$(python_get_sitedir)/omniorbpy_CORBA.py - - rm "${ED}"$(python_get_sitedir)/omniidl_be/__init__.py* - - # fixed the file collision from bug #247851 - rm "${ED}"$(python_get_sitedir)/__init__.py - } - python_execute_function -s installation - - dodoc COPYING.LIB README.txt README.Python || die - dohtml -r doc/omniORBpy || die - dodoc doc/omniORBpy.p* || die # ps,pdf - dodoc doc/tex/* || die # .bib, .tex + dohtml -r doc/omniORBpy + dodoc doc/omniORBpy.p* + dodoc doc/tex/* insinto /usr/share/doc/${PF}/ doins -r examples || die - -} - -pkg_postinst() { - python_mod_optimize $(python_get_sitedir) -} - -pkg_postrm() { - python_mod_cleanup }