| 1 |
commit: 1dfb644e272935bc447ad03fab0c6e451a448188 |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 4 11:33:01 2019 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 4 11:34:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfb644e |
| 7 |
|
| 8 |
net-misc/mico: revbump, for openssl-1.1 (#674098) |
| 9 |
|
| 10 |
Also, fix some quality compiler warnings, and use -fno-strict-aliasing |
| 11 |
compiler flag even with more recent (hence unknown) compiler versions. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/674098 |
| 14 |
Package-Manager: Portage-2.3.62, Repoman-2.3.11 |
| 15 |
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> |
| 16 |
|
| 17 |
net-misc/mico/Manifest | 1 + |
| 18 |
net-misc/mico/{mico-9999.ebuild => mico-2.3.13-r13.ebuild} | 13 +++++++------ |
| 19 |
net-misc/mico/mico-9999.ebuild | 13 +++++++------ |
| 20 |
3 files changed, 15 insertions(+), 12 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest |
| 23 |
index 8214f2d9dbd..498feb5d815 100644 |
| 24 |
--- a/net-misc/mico/Manifest |
| 25 |
+++ b/net-misc/mico/Manifest |
| 26 |
@@ -1,2 +1,3 @@ |
| 27 |
DIST mico-2.3.13-gentoo-patches-20170529.tar.xz 15196 BLAKE2B a25371cc1b7d0ee912aaa694943e9faa87f9c3df1c85186af1ab0d328bfa3138ce82381e1c91c732ae4b4d9d9b394058a1666af3b8547da675948aa556176a26 SHA512 ea7cbf00b33ed5eaacc5418539562645cecefc6f2ee7929d58517f7775fa62ac07a26967cd84570410281930b7a4570302f4edc9a9cc76661a99a5f28bce37cf |
| 28 |
+DIST mico-2.3.13-gentoo-r13.patch 133254 BLAKE2B 71e22f8bd7491b6aa594a32d7d2a5677b3fc1376bb8ff11eae20e6749ec9c582b99704030c2178f81f1b1fd4ac8f4c2b14e3c80cdf9769ed49004c5a4bab761d SHA512 4e4c60c8e3f6e303b136d17cc83cd5bb92a2b23c0a843721ba74e62d6c69224719bf254a5d8c028df0166c36a07ef349e98f4244b4d208e689c3b6c382c1b906 |
| 29 |
DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895 |
| 30 |
|
| 31 |
diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild |
| 32 |
similarity index 89% |
| 33 |
copy from net-misc/mico/mico-9999.ebuild |
| 34 |
copy to net-misc/mico/mico-2.3.13-r13.ebuild |
| 35 |
index 45fcd9ba749..4b4032d1f82 100644 |
| 36 |
--- a/net-misc/mico/mico-9999.ebuild |
| 37 |
+++ b/net-misc/mico/mico-2.3.13-r13.ebuild |
| 38 |
@@ -9,20 +9,20 @@ if [[ ${PV} == 9999 ]]; then |
| 39 |
EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository" |
| 40 |
inherit darcs |
| 41 |
SRC_URI="" |
| 42 |
+ PATCHES="${WORKDIR}/${P}-gentoo.patch" |
| 43 |
else |
| 44 |
- PATCH_VER=20170529 |
| 45 |
SRC_URI=" |
| 46 |
http://www.mico.org/${P}.tar.gz |
| 47 |
- https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz |
| 48 |
+ https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch |
| 49 |
" |
| 50 |
+ PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch" |
| 51 |
+ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" |
| 52 |
fi |
| 53 |
-PATCHES="${WORKDIR}/patches" |
| 54 |
|
| 55 |
DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard" |
| 56 |
HOMEPAGE="http://www.mico.org/" |
| 57 |
LICENSE="GPL-2 LGPL-2" |
| 58 |
SLOT="0" |
| 59 |
-KEYWORDS="" |
| 60 |
IUSE="gtk postgres ssl tcl threads X" |
| 61 |
RESTRICT="test" #298101 |
| 62 |
|
| 63 |
@@ -44,8 +44,7 @@ BDEPEND=" |
| 64 |
|
| 65 |
if [[ ${PV} == 9999 ]]; then |
| 66 |
src_unpack() { |
| 67 |
- mkdir patches || die |
| 68 |
- wget -O patches/gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die |
| 69 |
+ wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die |
| 70 |
darcs_src_unpack |
| 71 |
default |
| 72 |
} |
| 73 |
@@ -67,6 +66,7 @@ src_prepare() { |
| 74 |
|
| 75 |
src_configure() { |
| 76 |
tc-export CC CXX |
| 77 |
+ append-cxxflags -fno-strict-aliasing |
| 78 |
|
| 79 |
# Don't know which version of JavaCUP would suffice, but there is no |
| 80 |
# configure argument to disable checking for JavaCUP. |
| 81 |
@@ -132,6 +132,7 @@ src_install() { |
| 82 |
mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die |
| 83 |
|
| 84 |
dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO |
| 85 |
+ [[ ${PV} == 9999 ]] || dodoc FAQ |
| 86 |
} |
| 87 |
|
| 88 |
pkg_postinst() { |
| 89 |
|
| 90 |
diff --git a/net-misc/mico/mico-9999.ebuild b/net-misc/mico/mico-9999.ebuild |
| 91 |
index 45fcd9ba749..4b4032d1f82 100644 |
| 92 |
--- a/net-misc/mico/mico-9999.ebuild |
| 93 |
+++ b/net-misc/mico/mico-9999.ebuild |
| 94 |
@@ -9,20 +9,20 @@ if [[ ${PV} == 9999 ]]; then |
| 95 |
EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository" |
| 96 |
inherit darcs |
| 97 |
SRC_URI="" |
| 98 |
+ PATCHES="${WORKDIR}/${P}-gentoo.patch" |
| 99 |
else |
| 100 |
- PATCH_VER=20170529 |
| 101 |
SRC_URI=" |
| 102 |
http://www.mico.org/${P}.tar.gz |
| 103 |
- https://dev.gentoo.org/~haubi/distfiles/${P}-gentoo-patches-${PATCH_VER}.tar.xz |
| 104 |
+ https://github.com/haubi/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch |
| 105 |
" |
| 106 |
+ PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch" |
| 107 |
+ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt" |
| 108 |
fi |
| 109 |
-PATCHES="${WORKDIR}/patches" |
| 110 |
|
| 111 |
DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard" |
| 112 |
HOMEPAGE="http://www.mico.org/" |
| 113 |
LICENSE="GPL-2 LGPL-2" |
| 114 |
SLOT="0" |
| 115 |
-KEYWORDS="" |
| 116 |
IUSE="gtk postgres ssl tcl threads X" |
| 117 |
RESTRICT="test" #298101 |
| 118 |
|
| 119 |
@@ -44,8 +44,7 @@ BDEPEND=" |
| 120 |
|
| 121 |
if [[ ${PV} == 9999 ]]; then |
| 122 |
src_unpack() { |
| 123 |
- mkdir patches || die |
| 124 |
- wget -O patches/gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die |
| 125 |
+ wget -O ${P}-gentoo.patch "https://github.com/haubi/mico/compare/gentoo.patch" || die |
| 126 |
darcs_src_unpack |
| 127 |
default |
| 128 |
} |
| 129 |
@@ -67,6 +66,7 @@ src_prepare() { |
| 130 |
|
| 131 |
src_configure() { |
| 132 |
tc-export CC CXX |
| 133 |
+ append-cxxflags -fno-strict-aliasing |
| 134 |
|
| 135 |
# Don't know which version of JavaCUP would suffice, but there is no |
| 136 |
# configure argument to disable checking for JavaCUP. |
| 137 |
@@ -132,6 +132,7 @@ src_install() { |
| 138 |
mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die |
| 139 |
|
| 140 |
dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO |
| 141 |
+ [[ ${PV} == 9999 ]] || dodoc FAQ |
| 142 |
} |
| 143 |
|
| 144 |
pkg_postinst() { |
Archives