diff options
| -rw-r--r-- | net-misc/mico/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/mico/mico-9999.ebuild | 38 |
2 files changed, 19 insertions, 21 deletions
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest index 0622695d7d8a..99d1e54c460d 100644 --- a/net-misc/mico/Manifest +++ b/net-misc/mico/Manifest @@ -1,3 +1,3 @@ DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 BLAKE2B a25371cc1b7d0ee912aaa694943e9faa87f9c3df1c85186af1ab0d328bfa3138ce82381e1c91c732ae4b4d9d9b394058a1666af3b8547da675948aa556176a26 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895 -DIST mico-9999-gentoo-patches-20170529.tar.xz 16716 BLAKE2B 61aac1cc26031ca2c515a325ffc9dd28871e5a2e42e0d1367ccc619f04a6598d32241afc69e1c89f562bdd0e9ed5f0b217c611e3eeb7b0556fe20234bc20e98a SHA512 33361ab7a40fe897a48bf69fb33ffc3afa3da224a1589cfd7c4660deb00dcb9dd76dd2bc84ed968db6dd8a9e22aa493bb4b78713606675b6021f081eb56deb10 +DIST mico-9999-gentoo.patch 66675 BLAKE2B c403d2e6fe3b3e9a77f7a4d73b6152b73ff3eea76e35e16f705ce8da5935fdc4a0fd4b1136437cac5a0fb0b81f00f0461cba0d45e9cbf0d88f3ffc5faf1e7967 SHA512 2d709b90cc8c8873eca8df94acbb24cf484305dbadc8d913dc58912349677ded633e92faac4944076547cb064329d7a3dfc79a43ce9ff15b238d989f2bdd4a6d diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild index 596262c42dff..4938fe8397be 100644 --- a/net-misc/mico/mico-9999.ebuild +++ b/net-misc/mico/mico-9999.ebuild @@ -1,25 +1,22 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" inherit flag-o-matic toolchain-funcs autotools -PATCH_VER=20170529 - if [[ ${PV} == 9999 ]]; then EDARCS_REPOSITORY="http://www.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 + SRC_URI="https://github.com/haubi/mico/compare/gentoo.patch -> ${P}-gentoo.patch" + PATCHES="${DISTDIR}/${P}-gentoo.patch" else - PATCHES= + 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 + " + PATCHES="${WORKDIR}/patches" fi DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard" @@ -40,7 +37,8 @@ RDEPEND=" tcl? ( dev-lang/tcl:0 ) X? ( x11-libs/libXt ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +DEPEND=" >=sys-devel/flex-2.5.2 >=sys-devel/bison-1.22 " @@ -115,22 +113,22 @@ src_configure() { } src_install() { - emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=: + 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 + 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 + 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 + mv "${ED}"/usr/bin/{,mico-}eventd || die dodir /usr/share - mv "${ED}"usr/man "${ED}"usr/share || die + mv "${ED}"/usr/man "${ED}"/usr/share || die dodir /usr/share/doc/${PF} - mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die + mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO } |