net-misc/mico: revbump, for openssl-1.1 (#674098)
authorMichael Haubenwallner <haubi@gentoo.org>
Tue, 4 Jun 2019 11:33:01 +0000 (13:33 +0200)
committerMichael Haubenwallner <haubi@gentoo.org>
Tue, 4 Jun 2019 11:34:33 +0000 (13:34 +0200)
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@gentoo.org>
net-misc/mico/Manifest
net-misc/mico/mico-2.3.13-r13.ebuild [new file with mode: 0644]
net-misc/mico/mico-9999.ebuild

index 8214f2d9dbd4775820c69aecf58277398127564f..498feb5d815c1ace51c75a3d36596c2da129debf 100644 (file)
@@ -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-2.3.13-r13.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild
new file mode 100644 (file)
index 0000000..4b4032d
--- /dev/null
@@ -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."
+}
index 45fcd9ba749a1a85d7b870a43aae71e7cd8eca65..4b4032d1f82671ded066730589dc670ea195bd46 100644 (file)
@@ -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() {