1 |
commit: 88eb1c762bfa9a47000bf633cf083deaa84ce25d |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 16 17:15:26 2015 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 16 17:15:56 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88eb1c76 |
7 |
|
8 |
net-p2p/litecoind: fix for API change in miniunpnc, bug #567080. |
9 |
|
10 |
Package-Manager: portage-2.2.24 |
11 |
|
12 |
.../litecoind/files/litecoin-miniupnpc-abi.patch | 19 +++++ |
13 |
net-p2p/litecoind/litecoind-0.10.2.2-r1.ebuild | 98 ---------------------- |
14 |
....2.2-r2.ebuild => litecoind-0.10.2.2-r3.ebuild} | 5 +- |
15 |
3 files changed, 22 insertions(+), 100 deletions(-) |
16 |
|
17 |
diff --git a/net-p2p/litecoind/files/litecoin-miniupnpc-abi.patch b/net-p2p/litecoind/files/litecoin-miniupnpc-abi.patch |
18 |
new file mode 100644 |
19 |
index 0000000..7315ea9 |
20 |
--- /dev/null |
21 |
+++ b/net-p2p/litecoind/files/litecoin-miniupnpc-abi.patch |
22 |
@@ -0,0 +1,19 @@ |
23 |
+diff -Nuar litecoin-0.10.2.2/src/net.cpp litecoin-0.10.2.2-fix/src/net.cpp |
24 |
+--- litecoin-0.10.2.2/src/net.cpp 2015-06-15 08:51:30.000000000 +0000 |
25 |
++++ litecoin-0.10.2.2-fix/src/net.cpp 2015-12-16 12:38:52.881533970 +0000 |
26 |
+@@ -1020,10 +1020,14 @@ |
27 |
+ #ifndef UPNPDISCOVER_SUCCESS |
28 |
+ /* miniupnpc 1.5 */ |
29 |
+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0); |
30 |
+-#else |
31 |
++#elif MINIUPNPC_API_VERSION < 14 |
32 |
+ /* miniupnpc 1.6 */ |
33 |
+ int error = 0; |
34 |
+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error); |
35 |
++#else |
36 |
++ /* miniupnpc 1.9.20150730 */ |
37 |
++ int error = 0; |
38 |
++ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error); |
39 |
+ #endif |
40 |
+ |
41 |
+ struct UPNPUrls urls; |
42 |
\ No newline at end of file |
43 |
|
44 |
diff --git a/net-p2p/litecoind/litecoind-0.10.2.2-r1.ebuild b/net-p2p/litecoind/litecoind-0.10.2.2-r1.ebuild |
45 |
deleted file mode 100644 |
46 |
index 07e92b8..0000000 |
47 |
--- a/net-p2p/litecoind/litecoind-0.10.2.2-r1.ebuild |
48 |
+++ /dev/null |
49 |
@@ -1,98 +0,0 @@ |
50 |
-# Copyright 1999-2015 Gentoo Foundation |
51 |
-# Distributed under the terms of the GNU General Public License v2 |
52 |
-# $Id$ |
53 |
- |
54 |
-EAPI=5 |
55 |
- |
56 |
-DB_VER="4.8" |
57 |
- |
58 |
-inherit autotools db-use eutils systemd user |
59 |
- |
60 |
-MyPV="${PV/_/-}" |
61 |
-MyPN="litecoin" |
62 |
-MyP="${MyPN}-${MyPV}" |
63 |
- |
64 |
-DESCRIPTION="P2P Internet currency based on Bitcoin but easier to mine" |
65 |
-HOMEPAGE="https://litecoin.org/" |
66 |
-SRC_URI="https://github.com/${MyPN}-project/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyP}.tar.gz" |
67 |
- |
68 |
-LICENSE="MIT ISC GPL-2" |
69 |
-SLOT="0" |
70 |
-KEYWORDS="~amd64 ~x86" |
71 |
-IUSE="logrotate upnp +wallet" |
72 |
- |
73 |
-RDEPEND=" |
74 |
- dev-libs/boost[threads(+)] |
75 |
- dev-libs/openssl:0[-bindist] |
76 |
- logrotate? ( app-admin/logrotate ) |
77 |
- upnp? ( net-libs/miniupnpc ) |
78 |
- sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] |
79 |
- <=dev-libs/leveldb-1.15.0-r1 |
80 |
-" |
81 |
-DEPEND="${RDEPEND} |
82 |
- >=app-shells/bash-4.1 |
83 |
- sys-apps/sed |
84 |
-" |
85 |
- |
86 |
-S="${WORKDIR}/${MyP}" |
87 |
- |
88 |
-pkg_setup() { |
89 |
- local UG='litecoin' |
90 |
- enewgroup "${UG}" |
91 |
- enewuser "${UG}" -1 -1 /var/lib/litecoin "${UG}" |
92 |
-} |
93 |
- |
94 |
-src_prepare() { |
95 |
- epatch "${FILESDIR}/0.9.0-sys_leveldb.patch" |
96 |
- eautoreconf |
97 |
- rm -r src/leveldb |
98 |
-} |
99 |
- |
100 |
-src_configure() { |
101 |
- local my_econf= |
102 |
- if use upnp; then |
103 |
- my_econf="${my_econf} --with-miniupnpc --enable-upnp-default" |
104 |
- else |
105 |
- my_econf="${my_econf} --without-miniupnpc --disable-upnp-default" |
106 |
- fi |
107 |
- econf \ |
108 |
- $(use_enable wallet)\ |
109 |
- --disable-ccache \ |
110 |
- --disable-static \ |
111 |
- --disable-tests \ |
112 |
- --with-system-leveldb \ |
113 |
- --with-system-libsecp256k1 \ |
114 |
- --without-libs \ |
115 |
- --with-daemon \ |
116 |
- --without-gui \ |
117 |
- --without-qrencode \ |
118 |
- ${my_econf} |
119 |
-} |
120 |
- |
121 |
-src_install() { |
122 |
- default |
123 |
- |
124 |
- insinto /etc/litecoin |
125 |
- doins "${FILESDIR}/litecoin.conf" |
126 |
- fowners litecoin:litecoin /etc/litecoin/litecoin.conf |
127 |
- fperms 600 /etc/litecoin/litecoin.conf |
128 |
- |
129 |
- newconfd "${FILESDIR}/litecoin.confd" ${PN} |
130 |
- newinitd "${FILESDIR}/litecoin.initd-r1" ${PN} |
131 |
- systemd_dounit "${FILESDIR}/litecoin.service" |
132 |
- |
133 |
- keepdir /var/lib/litecoin/.litecoin |
134 |
- fperms 700 /var/lib/litecoin |
135 |
- fowners litecoin:litecoin /var/lib/litecoin/ |
136 |
- fowners litecoin:litecoin /var/lib/litecoin/.litecoin |
137 |
- dosym /etc/litecoin/litecoin.conf /var/lib/litecoin/.litecoin/litecoin.conf |
138 |
- |
139 |
- dodoc doc/README.md doc/release-notes.md |
140 |
- newman contrib/debian/manpages/bitcoind.1 litecoind.1 |
141 |
- newman contrib/debian/manpages/bitcoin.conf.5 litecoin.conf.5 |
142 |
- |
143 |
- if use logrotate; then |
144 |
- insinto /etc/logrotate.d |
145 |
- newins "${FILESDIR}/litecoind.logrotate" litecoind |
146 |
- fi |
147 |
-} |
148 |
|
149 |
diff --git a/net-p2p/litecoind/litecoind-0.10.2.2-r2.ebuild b/net-p2p/litecoind/litecoind-0.10.2.2-r3.ebuild |
150 |
similarity index 93% |
151 |
rename from net-p2p/litecoind/litecoind-0.10.2.2-r2.ebuild |
152 |
rename to net-p2p/litecoind/litecoind-0.10.2.2-r3.ebuild |
153 |
index 5951608..9c14a51 100644 |
154 |
--- a/net-p2p/litecoind/litecoind-0.10.2.2-r2.ebuild |
155 |
+++ b/net-p2p/litecoind/litecoind-0.10.2.2-r3.ebuild |
156 |
@@ -43,8 +43,9 @@ pkg_setup() { |
157 |
} |
158 |
|
159 |
src_prepare() { |
160 |
- epatch "${FILESDIR}/0.9.0-sys_leveldb.patch" |
161 |
- epatch "${FILESDIR}/${P}-memenv_h.patch" |
162 |
+ epatch "${FILESDIR}"/0.9.0-sys_leveldb.patch |
163 |
+ epatch "${FILESDIR}"/litecoind-0.10.2.2-memenv_h.patch |
164 |
+ epatch "${FILESDIR}"/litecoin-miniupnpc-abi.patch |
165 |
eautoreconf |
166 |
rm -r src/leveldb |
167 |
} |