commit: 1dfb644e272935bc447ad03fab0c6e451a448188 Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> AuthorDate: Tue Jun 4 11:33:01 2019 +0000 Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> CommitDate: Tue Jun 4 11:34:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfb644e
net-misc/mico: revbump, for openssl-1.1 (#674098) Also, fix some quality compiler warnings, and use -fno-strict-aliasing compiler flag even with more recent (hence unknown) compiler versions. Closes: https://bugs.gentoo.org/674098 Package-Manager: Portage-2.3.62, Repoman-2.3.11 Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> net-misc/mico/Manifest | 1 + net-misc/mico/{mico-9999.ebuild => mico-2.3.13-r13.ebuild} | 13 +++++++------ net-misc/mico/mico-9999.ebuild | 13 +++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest index 8214f2d9dbd..498feb5d815 100644 --- a/net-misc/mico/Manifest +++ b/net-misc/mico/Manifest @@ -1,2 +1,3 @@ DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 BLAKE2B a25371cc1b7d0ee912aaa694943e9faa87f9c3df1c85186af1ab0d328bfa3138ce82381e1c91c732ae4b4d9d9b394058a1666af3b8547da675948aa556176a26 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf +DIST mico-2.3.13-gentoo-r13.patch 133254 BLAKE2B 71e22f8bd7491b6aa594a32d7d2a5677b3fc1376bb8ff11eae20e6749ec9c582b99704030c2178f81f1b1fd4ac8f4c2b14e3c80cdf9769ed49004c5a4bab761d SHA512 4e4c60c8e3f6e303b136d17cc83cd5bb92a2b23c0a843721ba74e62d6c69224719bf254a5d8c028df0166c36a07ef349e98f4244b4d208e689c3b6c382c1b906 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895 diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild similarity index 89% copy from net-misc/mico/mico-9999.ebuild copy to net-misc/mico/mico-2.3.13-r13.ebuild index 45fcd9ba749..4b4032d1f82 100644 --- a/net-misc/mico/mico-9999.ebuild +++ b/net-misc/mico/mico-2.3.13-r13.ebuild @@ -9,20 +9,20 @@ if [[ ${PV} == 9999 ]]; then EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository" inherit darcs SRC_URI="" + PATCHES="${WORKDIR}/${P}-gentoo.patch" else - PATCH_VER=20170529 SRC_URI=" http://www.mico.org/${P}.tar.gz - https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz + https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch " + PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch" + KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" fi -PATCHES="${WORKDIR}/patches" DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard" HOMEPAGE="http://www.mico.org/" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="" IUSE="gtk postgres ssl tcl threads X" RESTRICT="test" #298101 @@ -44,8 +44,7 @@ BDEPEND=" if [[ ${PV} == 9999 ]]; then src_unpack() { - mkdir patches || die - wget -O patches/gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die + wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die darcs_src_unpack default } @@ -67,6 +66,7 @@ src_prepare() { src_configure() { tc-export CC CXX + append-cxxflags -fno-strict-aliasing # Don't know which version of JavaCUP would suffice, but there is no # configure argument to disable checking for JavaCUP. @@ -132,6 +132,7 @@ src_install() { mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO + [[ ${PV} == 9999 ]] || dodoc FAQ } pkg_postinst() { diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild index 45fcd9ba749..4b4032d1f82 100644 --- a/net-misc/mico/mico-9999.ebuild +++ b/net-misc/mico/mico-9999.ebuild @@ -9,20 +9,20 @@ if [[ ${PV} == 9999 ]]; then EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository" inherit darcs SRC_URI="" + PATCHES="${WORKDIR}/${P}-gentoo.patch" else - PATCH_VER=20170529 SRC_URI=" http://www.mico.org/${P}.tar.gz - https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz + https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch " + PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch" + KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" fi -PATCHES="${WORKDIR}/patches" DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard" HOMEPAGE="http://www.mico.org/" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="" IUSE="gtk postgres ssl tcl threads X" RESTRICT="test" #298101 @@ -44,8 +44,7 @@ BDEPEND=" if [[ ${PV} == 9999 ]]; then src_unpack() { - mkdir patches || die - wget -O patches/gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die + wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die darcs_src_unpack default } @@ -67,6 +66,7 @@ src_prepare() { src_configure() { tc-export CC CXX + append-cxxflags -fno-strict-aliasing # Don't know which version of JavaCUP would suffice, but there is no # configure argument to disable checking for JavaCUP. @@ -132,6 +132,7 @@ src_install() { mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO + [[ ${PV} == 9999 ]] || dodoc FAQ } pkg_postinst() {
