From 73c318acdaf6f8309d68bd266051e6dd1f1bd787 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Jun 2019 09:04:53 +0100 Subject: gentoo resync : 08.06.2019 --- net-misc/mico/Manifest | 7 +- net-misc/mico/mico-2.3.13-r12.ebuild | 149 ----------------------------------- net-misc/mico/mico-2.3.13-r13.ebuild | 146 ++++++++++++++++++++++++++++++++++ net-misc/mico/mico-9999.ebuild | 14 ++-- 4 files changed, 157 insertions(+), 159 deletions(-) delete mode 100644 net-misc/mico/mico-2.3.13-r12.ebuild create mode 100644 net-misc/mico/mico-2.3.13-r13.ebuild (limited to 'net-misc/mico') diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest index 97673984bf12..9690a2607e59 100644 --- a/net-misc/mico/Manifest +++ b/net-misc/mico/Manifest @@ -1,6 +1,5 @@ -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 -DIST mico-9999-gentoo.patch 66675 BLAKE2B c403d2e6fe3b3e9a77f7a4d73b6152b73ff3eea76e35e16f705ce8da5935fdc4a0fd4b1136437cac5a0fb0b81f00f0461cba0d45e9cbf0d88f3ffc5faf1e7967 SHA512 2d709b90cc8c8873eca8df94acbb24cf484305dbadc8d913dc58912349677ded633e92faac4944076547cb064329d7a3dfc79a43ce9ff15b238d989f2bdd4a6d -EBUILD mico-2.3.13-r12.ebuild 4199 BLAKE2B 0baa83f3f5fb24fff5ff7c5778751aad2dedf78a107d06bd93a545823cf72f6f66e73e5eec8100f503550902f3e7e119d0faa1fc0ae1e5ee968c4aa334fd4a80 SHA512 2563faf67faadd1b382b766131ac003b1862d132628ceeab9872abe3f7450569c7a8ef6e0aca73ee961534478f418672da1f7ef61d9e4e24f45355d98b1e9870 -EBUILD mico-9999.ebuild 4131 BLAKE2B f4a40e64ee6499b8d5520f2634f72b00410a33853f93bf003bcb79ec0178bd18148a6c3a66924a7a3b5111d18784d8de5a2bf93729b75001e4b9efceb36a5961 SHA512 05c1e23b787a5c31714fe9bc2ba4a28617c8febf554a5c9bf697de5f3fdda8f277fb2ba178d7cbf223def4e232c9c5d73b6a915cb559e6358588464af9b02906 +EBUILD mico-2.3.13-r13.ebuild 4328 BLAKE2B e569938f537160595c3a546a4da8a3f2a43283c580e11ee0975d0620e1c02720522251f302c4953ed2420fd75086cb24e6c8a7aab2ad13f0e85a33ac924283af SHA512 7ed391ebfd57867eee96ef417a7356721d7cd0fdd72c372844f1ea730dce327e66efdde00864bf894bd319abf044823d9752b5414069b2804cff0b6e0bb24319 +EBUILD mico-9999.ebuild 4328 BLAKE2B e569938f537160595c3a546a4da8a3f2a43283c580e11ee0975d0620e1c02720522251f302c4953ed2420fd75086cb24e6c8a7aab2ad13f0e85a33ac924283af SHA512 7ed391ebfd57867eee96ef417a7356721d7cd0fdd72c372844f1ea730dce327e66efdde00864bf894bd319abf044823d9752b5414069b2804cff0b6e0bb24319 MISC metadata.xml 631 BLAKE2B bb0a1ee82b5b74160096ad9652a933f25c51f192ff30b3ae18d477aacff13a1021aa959e238b9103957ddff622b40f4ec8269b35b114d2325e3f75f90891c580 SHA512 111d8d30478b2647475b075f3c16f49b14be2bbde9e55b0b9efde42c0eaa8da128dd6801a914a898a8500d705d034d50ad05f7b41da5ec644f3c1bad12f21840 diff --git a/net-misc/mico/mico-2.3.13-r12.ebuild b/net-misc/mico/mico-2.3.13-r12.ebuild deleted file mode 100644 index 97281d44bfd2..000000000000 --- a/net-misc/mico/mico-2.3.13-r12.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit flag-o-matic toolchain-funcs autotools - -PATCH_VER=20170529 - -if [[ ${PV} == 9999 ]]; then - EDARCS_REPOSITORY="http://mico.org/mico-darcs-repository" - inherit darcs - SRC_URI= -else - SRC_URI="http://www.mico.org/${P}.tar.gz" -fi - -if [[ -n ${PATCH_VER} ]]; then - SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz" - PATCHES=${WORKDIR}/patches -else - PATCHES= -fi - -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="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" -IUSE="gtk postgres ssl tcl threads X" -RESTRICT="test" #298101 - -# doesn't compile: -# bluetooth? ( net-wireless/bluez ) - -RDEPEND=" - gtk? ( x11-libs/gtk+:2 ) - postgres? ( dev-db/postgresql:* ) - ssl? ( dev-libs/openssl:0= ) - tcl? ( dev-lang/tcl:0 ) - X? ( x11-libs/libXt ) -" -DEPEND="${RDEPEND} - >=sys-devel/flex-2.5.2 - >=sys-devel/bison-1.22 -" - -if [[ ${PV} == 9999 ]]; then - src_unpack() { - darcs_src_unpack - default - } -else - S=${WORKDIR}/${PN} -fi - -src_prepare() { - default - - eautoreconf - - # cannot use big TOC (AIX only), gdb doesn't like it. - # This assumes that the compiler (or -wrapper) uses - # gcc flag '-mminimal-toc' for compilation. - sed -i -e 's/,-bbigtoc//' "${S}"/configure || die -} - -src_configure() { - tc-export CC CXX - - if use gtk && [[ -n ${PATCH_VER} ]]; then - # need gtk-1 wrapper for gtk-2 - export PATH="${WORKDIR}"/helpers:${PATH} - fi - - # Don't know which version of JavaCUP would suffice, but there is no - # configure argument to disable checking for JavaCUP. - # So we override the configure check to not find 'javac'. - export ac_cv_path_JAVAC=no - - # '--without-ssl' just does not add another search path - the only way - # to disable openssl utilization seems to override the configure check. - use ssl || export ac_cv_lib_ssl_open=no - - local myconf= - myconf() { - myconf="${myconf} $*" - } - - myconf --disable-mini-stl - myconf $(use_enable threads) - - # '--without-*' or '--with-*=no' does not disable some features, - # the value needs to be empty instead. - # This applies to: gtk, pgsql, qt, tcl, bluetooth. - myconf --with-gtk=$( use gtk && echo "${EPREFIX}"/usr) - myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr) - myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr) - # bluetooth and wireless both don't compile cleanly - myconf --with-bluetooth='' - myconf --disable-wireless - # But --without-x works. - myconf $(use_with X x "${EPREFIX}"/usr) - - # http://www.mico.org/pipermail/mico-devel/2009-April/010285.html - [[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED - - if [[ ${CHOST} == *-winnt* ]]; then - # disabling static libs, since ar on interix takes nearly - # one hour per library, thanks to mico's monster objects. - use threads && - ewarn "disabling USE='threads', does not work on ${CHOST}" - myconf --disable-threads --disable-static --enable-final - append-flags -D__STDC__ - fi - - econf ${myconf} -} - -src_install() { - emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=: - if [[ $(get_libdir) != lib ]]; then #500744 - mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die - fi - - # avoid conflict with net-dns/nsd, bug#544488 - mv "${ED}"usr/bin/{,mico-}nsd || die - mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die - - # avoid conflict with net-misc/eventd, bug#632170 - mv "${ED}"usr/bin/{,mico-}eventd || die - - dodir /usr/share - mv "${ED}"usr/man "${ED}"usr/share || die - dodir /usr/share/doc/${PF} - mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die - - dodoc BUGS CHANGES* CONVERT FAQ README* ROADMAP TODO VERSION WTODO -} - -pkg_postinst() { - einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'" - einfo "due to a name conflict with net-dns/nsd. For details" - einfo "please refer to https://bugs.gentoo.org/544488." - einfo - einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'" - einfo "due to a name conflict with net-misc/eventd. For details" - einfo "please refer to https://bugs.gentoo.org/632170." -} diff --git a/net-misc/mico/mico-2.3.13-r13.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild new file mode 100644 index 000000000000..4b4032d1f826 --- /dev/null +++ b/net-misc/mico/mico-2.3.13-r13.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic toolchain-funcs autotools + +if [[ ${PV} == 9999 ]]; then + EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository" + inherit darcs + SRC_URI="" + PATCHES="${WORKDIR}/${P}-gentoo.patch" +else + SRC_URI=" + http://www.mico.org/${P}.tar.gz + 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 + +DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard" +HOMEPAGE="http://www.mico.org/" +LICENSE="GPL-2 LGPL-2" +SLOT="0" +IUSE="gtk postgres ssl tcl threads X" +RESTRICT="test" #298101 + +# doesn't compile: +# bluetooth? ( net-wireless/bluez ) + +RDEPEND=" + gtk? ( x11-libs/gtk+:2 ) + postgres? ( dev-db/postgresql:* ) + ssl? ( dev-libs/openssl:0= ) + tcl? ( dev-lang/tcl:0 ) + X? ( x11-libs/libXt ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=sys-devel/flex-2.5.2 + >=sys-devel/bison-1.22 +" + +if [[ ${PV} == 9999 ]]; then + src_unpack() { + wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die + darcs_src_unpack + default + } +else + S=${WORKDIR}/${PN} +fi + +src_prepare() { + default + + mv configure.in configure.ac || die #426262 + eautoreconf + + # cannot use big TOC (AIX only), gdb doesn't like it. + # This assumes that the compiler (or -wrapper) uses + # gcc flag '-mminimal-toc' for compilation. + sed -i -e 's/,-bbigtoc//' "${S}"/configure || die +} + +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. + # So we override the configure check to not find 'javac'. + export ac_cv_path_JAVAC=no + + # '--without-ssl' just does not add another search path - the only way + # to disable openssl utilization seems to override the configure check. + use ssl || export ac_cv_lib_ssl_open=no + + local myconf= + myconf() { + myconf="${myconf} $*" + } + + myconf --disable-mini-stl + myconf $(use_enable threads) + + # '--without-*' or '--with-*=no' does not disable some features, + # the value needs to be empty instead. + # This applies to: pgsql, qt, tcl, bluetooth. + myconf --with-pgsql=$(use postgres && echo "${EPREFIX}"/usr) + myconf --with-tcl=$( use tcl && echo "${EPREFIX}"/usr) + # bluetooth and wireless both don't compile cleanly + myconf --with-bluetooth='' + myconf --disable-wireless + # But --without-x works. + myconf $(use_with X x "${EPREFIX}"/usr) + # Same for gtk after patch 013, searches for gtk release. + myconf $(use_with gtk gtk 2) + + # http://www.mico.org/pipermail/mico-devel/2009-April/010285.html + [[ ${CHOST} == *-hpux* ]] && append-cppflags -D_XOPEN_SOURCE_EXTENDED + + if [[ ${CHOST} == *-winnt* ]]; then + # disabling static libs, since ar on interix takes nearly + # one hour per library, thanks to mico's monster objects. + use threads && + ewarn "disabling USE='threads', does not work on ${CHOST}" + myconf --disable-threads --disable-static --enable-final + append-flags -D__STDC__ + fi + + econf ${myconf} +} + +src_install() { + emake INSTDIR="${ED}"/usr SHARED_INSTDIR="${ED}"/usr install LDCONFIG=: + if [[ $(get_libdir) != lib ]]; then #500744 + mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die + fi + + # avoid conflict with net-dns/nsd, bug#544488 + mv "${ED}"/usr/bin/{,mico-}nsd || die + mv "${ED}"/usr/man/man8/{,mico-}nsd.8 || die + + # avoid conflict with net-misc/eventd, bug#632170 + mv "${ED}"/usr/bin/{,mico-}eventd || die + + dodir /usr/share + mv "${ED}"/usr/man "${ED}"/usr/share || die + dodir /usr/share/doc/${PF} + 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() { + einfo "The MICO Name Service daemon 'nsd' is named 'mico-nsd'" + einfo "due to a name conflict with net-dns/nsd. For details" + einfo "please refer to https://bugs.gentoo.org/544488." + einfo + einfo "The MICO Event daemon 'eventd' is named 'mico-eventd'" + einfo "due to a name conflict with net-misc/eventd. For details" + einfo "please refer to https://bugs.gentoo.org/632170." +} diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild index ba56c4b4614b..4b4032d1f826 100644 --- a/net-misc/mico/mico-9999.ebuild +++ b/net-misc/mico/mico-9999.ebuild @@ -8,22 +8,21 @@ inherit flag-o-matic toolchain-funcs autotools if [[ ${PV} == 9999 ]]; then EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository" inherit darcs - SRC_URI="https://github.com/haubi/mico/compare/gentoo.patch -> ${P}-gentoo.patch" - PATCHES="${DISTDIR}/${P}-gentoo.patch" + 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="${WORKDIR}/patches" + PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch" + KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" fi 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 @@ -45,6 +44,7 @@ BDEPEND=" if [[ ${PV} == 9999 ]]; then src_unpack() { + wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die darcs_src_unpack default } @@ -66,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. @@ -131,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() { -- cgit v1.2.3