| 1 |
commit: 6ca8102e790cd6eb7bf992f5fc8bdcf5ab685092 |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 28 08:32:44 2019 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 28 08:33:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ca8102e |
| 7 |
|
| 8 |
net-misc/mico-9999: EAPI 7, live patch from github |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 11 |
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> |
| 12 |
|
| 13 |
net-misc/mico/Manifest | 2 +- |
| 14 |
net-misc/mico/mico-9999.ebuild | 38 ++++++++++++++++++-------------------- |
| 15 |
2 files changed, 19 insertions(+), 21 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest |
| 18 |
index 0622695d7d8..99d1e54c460 100644 |
| 19 |
--- a/net-misc/mico/Manifest |
| 20 |
+++ b/net-misc/mico/Manifest |
| 21 |
@@ -1,3 +1,3 @@ |
| 22 |
DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 BLAKE2B a25371cc1b7d0ee912aaa694943e9faa87f9c3df1c85186af1ab0d328bfa3138ce82381e1c91c732ae4b4d9d9b394058a1666af3b8547da675948aa556176a26 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf |
| 23 |
DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895 |
| 24 |
-DIST mico-9999-gentoo-patches-20170529.tar.xz 16716 BLAKE2B 61aac1cc26031ca2c515a325ffc9dd28871e5a2e42e0d1367ccc619f04a6598d32241afc69e1c89f562bdd0e9ed5f0b217c611e3eeb7b0556fe20234bc20e98a SHA512 33361ab7a40fe897a48bf69fb33ffc3afa3da224a1589cfd7c4660deb00dcb9dd76dd2bc84ed968db6dd8a9e22aa493bb4b78713606675b6021f081eb56deb10 |
| 25 |
+DIST mico-9999-gentoo.patch 66675 BLAKE2B c403d2e6fe3b3e9a77f7a4d73b6152b73ff3eea76e35e16f705ce8da5935fdc4a0fd4b1136437cac5a0fb0b81f00f0461cba0d45e9cbf0d88f3ffc5faf1e7967 SHA512 2d709b90cc8c8873eca8df94acbb24cf484305dbadc8d913dc58912349677ded633e92faac4944076547cb064329d7a3dfc79a43ce9ff15b238d989f2bdd4a6d |
| 26 |
|
| 27 |
diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild |
| 28 |
index 596262c42df..4938fe8397b 100644 |
| 29 |
--- a/net-misc/mico/mico-9999.ebuild |
| 30 |
+++ b/net-misc/mico/mico-9999.ebuild |
| 31 |
@@ -1,25 +1,22 @@ |
| 32 |
# Copyright 1999-2019 Gentoo Authors |
| 33 |
# Distributed under the terms of the GNU General Public License v2 |
| 34 |
|
| 35 |
-EAPI="6" |
| 36 |
+EAPI="7" |
| 37 |
|
| 38 |
inherit flag-o-matic toolchain-funcs autotools |
| 39 |
|
| 40 |
-PATCH_VER=20170529 |
| 41 |
- |
| 42 |
if [[ ${PV} == 9999 ]]; then |
| 43 |
EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository" |
| 44 |
inherit darcs |
| 45 |
- SRC_URI= |
| 46 |
-else |
| 47 |
- SRC_URI="http://www.mico.org/${P}.tar.gz" |
| 48 |
-fi |
| 49 |
- |
| 50 |
-if [[ -n ${PATCH_VER} ]]; then |
| 51 |
- SRC_URI+=" https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz" |
| 52 |
- PATCHES=${WORKDIR}/patches |
| 53 |
+ SRC_URI="https://github.com/haubi/mico/compare/gentoo.patch -> ${P}-gentoo.patch" |
| 54 |
+ PATCHES="${DISTDIR}/${P}-gentoo.patch" |
| 55 |
else |
| 56 |
- PATCHES= |
| 57 |
+ PATCH_VER=20170529 |
| 58 |
+ SRC_URI=" |
| 59 |
+ http://www.mico.org/${P}.tar.gz |
| 60 |
+ https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz |
| 61 |
+ " |
| 62 |
+ PATCHES="${WORKDIR}/patches" |
| 63 |
fi |
| 64 |
|
| 65 |
DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard" |
| 66 |
@@ -40,7 +37,8 @@ RDEPEND=" |
| 67 |
tcl? ( dev-lang/tcl:0 ) |
| 68 |
X? ( x11-libs/libXt ) |
| 69 |
" |
| 70 |
-DEPEND="${RDEPEND} |
| 71 |
+DEPEND="${RDEPEND}" |
| 72 |
+DEPEND=" |
| 73 |
>=sys-devel/flex-2.5.2 |
| 74 |
>=sys-devel/bison-1.22 |
| 75 |
" |
| 76 |
@@ -115,22 +113,22 @@ src_configure() { |
| 77 |
} |
| 78 |
|
| 79 |
src_install() { |
| 80 |
- emake INSTDIR="${ED}"usr SHARED_INSTDIR="${ED}"usr install LDCONFIG=: |
| 81 |
+ emake INSTDIR="${ED}"/usr SHARED_INSTDIR="${ED}"/usr install LDCONFIG=: |
| 82 |
if [[ $(get_libdir) != lib ]]; then #500744 |
| 83 |
- mv "${ED}"usr/lib "${ED}"usr/$(get_libdir) || die |
| 84 |
+ mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) || die |
| 85 |
fi |
| 86 |
|
| 87 |
# avoid conflict with net-dns/nsd, bug#544488 |
| 88 |
- mv "${ED}"usr/bin/{,mico-}nsd || die |
| 89 |
- mv "${ED}"usr/man/man8/{,mico-}nsd.8 || die |
| 90 |
+ mv "${ED}"/usr/bin/{,mico-}nsd || die |
| 91 |
+ mv "${ED}"/usr/man/man8/{,mico-}nsd.8 || die |
| 92 |
|
| 93 |
# avoid conflict with net-misc/eventd, bug#632170 |
| 94 |
- mv "${ED}"usr/bin/{,mico-}eventd || die |
| 95 |
+ mv "${ED}"/usr/bin/{,mico-}eventd || die |
| 96 |
|
| 97 |
dodir /usr/share |
| 98 |
- mv "${ED}"usr/man "${ED}"usr/share || die |
| 99 |
+ mv "${ED}"/usr/man "${ED}"/usr/share || die |
| 100 |
dodir /usr/share/doc/${PF} |
| 101 |
- mv "${ED}"usr/doc "${ED}"usr/share/doc/${PF} || die |
| 102 |
+ mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die |
| 103 |
|
| 104 |
dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO |
| 105 |
} |
Archives