1 |
commit: 2c71f3501ba59325b5efe8751e1a18a9e279e3a3 |
2 |
Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 30 22:07:31 2020 +0000 |
4 |
Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 30 22:08:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c71f350 |
7 |
|
8 |
net-libs/libupnp: Drop 1.8 slot |
9 |
|
10 |
Closes: https://bugs.gentoo.org/691866 |
11 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
12 |
Signed-off-by: Ian Whyman <thev00d00 <AT> gentoo.org> |
13 |
|
14 |
net-libs/libupnp/Manifest | 1 - |
15 |
...ibupnp-1.8.4.ebuild => libupnp-1.8.6-r1.ebuild} | 29 +-------- |
16 |
net-libs/libupnp/libupnp-1.8.6.ebuild | 70 ---------------------- |
17 |
3 files changed, 3 insertions(+), 97 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest |
20 |
index f453389e42a..eb00c2c047c 100644 |
21 |
--- a/net-libs/libupnp/Manifest |
22 |
+++ b/net-libs/libupnp/Manifest |
23 |
@@ -1,5 +1,4 @@ |
24 |
DIST libupnp-1.12.0.tar.gz 786378 BLAKE2B b1b264c8b254cab79c423fd3efa0911b86aa5ce7ccac35ff61dd5d7fefa9a71d7ce2a513f208b83d66a571483ce8fc179978009908e66b8fc3ff2a1df3d8f26e SHA512 998ef22d2af8e4cbc7fa1f87613ae0aa840e636bb72a5656a97327b0820a46b2b3ed2f3200260c018b5339de2fc4be760d42a3c687e49c7fedb58c1ad2287699 |
25 |
DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1ad3a918f556a7d37a6e994b67d825608edd3fd788a5b5979de72e3b25288225af3b5b8c58f54395682eef50bfc2d2 SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb |
26 |
DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f |
27 |
-DIST libupnp-1.8.4.tar.gz 783896 BLAKE2B 483ae5344b0677441a02d4666476090e00d0f7b7798e24a7dbe7ea10cd68f02644851ba17cff06033714dc9f2ddf7d9c5588e5a54693f14ad1a9782a7751480d SHA512 6d96dc0dcf187a425f3b60f4e750102331bd0a5bd452007e345eeacb63e9287ac213574c8071294809283ff8d8795433706ed2a14bae3d451605bf7a75e5a5bb |
28 |
DIST libupnp-1.8.6.tar.gz 784912 BLAKE2B 8b2ac2dbe6b2bae64677d4e47142f42ad6b3c5af61e03faa628a2859afe62a2cb7a16cbfcfa9a0a307db8210f3786e916d3ac12eba3deee68c3c944c98801bb2 SHA512 8224460fcd808ed44e46c1c5dfc9236521b34fd140469d6549f42468b3acce83f46cb20cde41de574f55a865067a5f30ebbda68b500784c19cef354265f5acb7 |
29 |
|
30 |
diff --git a/net-libs/libupnp/libupnp-1.8.4.ebuild b/net-libs/libupnp/libupnp-1.8.6-r1.ebuild |
31 |
similarity index 60% |
32 |
rename from net-libs/libupnp/libupnp-1.8.4.ebuild |
33 |
rename to net-libs/libupnp/libupnp-1.8.6-r1.ebuild |
34 |
index a1fc1c7d028..14fc805526f 100644 |
35 |
--- a/net-libs/libupnp/libupnp-1.8.4.ebuild |
36 |
+++ b/net-libs/libupnp/libupnp-1.8.6-r1.ebuild |
37 |
@@ -1,4 +1,4 @@ |
38 |
-# Copyright 1999-2018 Gentoo Authors |
39 |
+# Copyright 1999-2020 Gentoo Authors |
40 |
# Distributed under the terms of the GNU General Public License v2 |
41 |
|
42 |
EAPI=6 |
43 |
@@ -10,8 +10,8 @@ HOMEPAGE="http://pupnp.sourceforge.net/" |
44 |
SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz" |
45 |
|
46 |
LICENSE="BSD" |
47 |
-SLOT="1.8" |
48 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
49 |
+SLOT="0" |
50 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux" |
51 |
IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs" |
52 |
|
53 |
DOCS="ChangeLog" |
54 |
@@ -44,27 +44,4 @@ src_install () { |
55 |
default |
56 |
|
57 |
use static-libs || prune_libtool_files |
58 |
- |
59 |
- # Slot samples |
60 |
- if $(use samples); then |
61 |
- for bin in combo ctrlpt device ; do |
62 |
- newbin "upnp/sample/.libs/tv_$bin" "tv_$bin-${SLOT}" |
63 |
- done |
64 |
- fi |
65 |
- |
66 |
- # Slot includes |
67 |
- cd "${D}/usr/include" || die |
68 |
- mv upnp "upnp-${SLOT}" || die |
69 |
- |
70 |
- # Slot pkgconfig |
71 |
- cd "${D}/usr/$(get_libdir)/pkgconfig" || die |
72 |
- mv libupnp.pc "libupnp-${SLOT}.pc" || die |
73 |
- sed -i -e "s#/upnp#/upnp-${SLOT}#" \ |
74 |
- -e "s#lupnp#lupnp-${SLOT}#" \ |
75 |
- -e "s#lixml#lixml-${SLOT}#" "libupnp-${SLOT}.pc" || die |
76 |
- |
77 |
- # Slot symlinks |
78 |
- cd "${D}/usr/$(get_libdir)" || die |
79 |
- mv libupnp.so "libupnp-${SLOT}.so" || die |
80 |
- mv libixml.so "libixml-${SLOT}.so" || die |
81 |
} |
82 |
|
83 |
diff --git a/net-libs/libupnp/libupnp-1.8.6.ebuild b/net-libs/libupnp/libupnp-1.8.6.ebuild |
84 |
deleted file mode 100644 |
85 |
index 2d629febf65..00000000000 |
86 |
--- a/net-libs/libupnp/libupnp-1.8.6.ebuild |
87 |
+++ /dev/null |
88 |
@@ -1,70 +0,0 @@ |
89 |
-# Copyright 1999-2019 Gentoo Authors |
90 |
-# Distributed under the terms of the GNU General Public License v2 |
91 |
- |
92 |
-EAPI=6 |
93 |
- |
94 |
-inherit eutils flag-o-matic autotools vcs-snapshot |
95 |
- |
96 |
-DESCRIPTION="An Portable Open Source UPnP Development Kit" |
97 |
-HOMEPAGE="http://pupnp.sourceforge.net/" |
98 |
-SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz" |
99 |
- |
100 |
-LICENSE="BSD" |
101 |
-SLOT="1.8" |
102 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" |
103 |
-IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs" |
104 |
- |
105 |
-DOCS="ChangeLog" |
106 |
- |
107 |
-PATCHES=( |
108 |
- "${FILESDIR}"/${PN}-1.6.21-cflags.patch |
109 |
-) |
110 |
- |
111 |
-src_prepare() { |
112 |
- default |
113 |
- |
114 |
- # fix tests |
115 |
- chmod +x ixml/test/test_document.sh || die |
116 |
- |
117 |
- eautoreconf |
118 |
-} |
119 |
- |
120 |
-src_configure() { |
121 |
- use x86-fbsd && append-flags -O1 |
122 |
- # w/o docdir to avoid sandbox violations |
123 |
- econf $(use_enable debug) \ |
124 |
- $(use_enable blocking-tcp blocking-tcp-connections) \ |
125 |
- $(use_enable ipv6) \ |
126 |
- $(use_enable reuseaddr) \ |
127 |
- $(use_enable static-libs static) \ |
128 |
- $(use_enable samples) |
129 |
-} |
130 |
- |
131 |
-src_install () { |
132 |
- default |
133 |
- |
134 |
- use static-libs || prune_libtool_files |
135 |
- |
136 |
- # Slot samples |
137 |
- if $(use samples); then |
138 |
- for bin in combo ctrlpt device ; do |
139 |
- newbin "upnp/sample/.libs/tv_$bin" "tv_$bin-${SLOT}" |
140 |
- done |
141 |
- fi |
142 |
- |
143 |
- # Slot includes |
144 |
- cd "${D}/usr/include" || die |
145 |
- mv upnp "upnp-${SLOT}" || die |
146 |
- |
147 |
- # Slot pkgconfig |
148 |
- cd "${D}/usr/$(get_libdir)/pkgconfig" || die |
149 |
- mv libupnp.pc "libupnp-${SLOT}.pc" || die |
150 |
- sed -i -e "s#/upnp#/upnp-${SLOT}#" \ |
151 |
- -e "s#lupnp#lupnp-${SLOT}#" \ |
152 |
- -e "s#lixml#lixml-${SLOT}#" "libupnp-${SLOT}.pc" || die |
153 |
- |
154 |
- # Slot symlinks |
155 |
- cd "${D}/usr/$(get_libdir)" || die |
156 |
- mv libupnp.so "libupnp-${SLOT}.so" || die |
157 |
- mv libixml.so "libixml-${SLOT}.so" || die |
158 |
-} |