| 1 |
commit: b878809f444d3f0dbb5776ff0191ddee316e0f2b |
| 2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 13 16:36:36 2018 +0000 |
| 4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 13 18:04:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b878809f |
| 7 |
|
| 8 |
net-libs/libhubbub: drop netsurf eclass |
| 9 |
|
| 10 |
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
net-libs/libhubbub/Manifest | 1 - |
| 14 |
...bbub-0.3.5.ebuild => libhubbub-0.3.5-r1.ebuild} | 35 +++++++++++++++++----- |
| 15 |
2 files changed, 27 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest |
| 18 |
index 5e37967617e..737a61e6541 100644 |
| 19 |
--- a/net-libs/libhubbub/Manifest |
| 20 |
+++ b/net-libs/libhubbub/Manifest |
| 21 |
@@ -1,4 +1,3 @@ |
| 22 |
DIST libhubbub-0.3.3-src.tar.gz 783945 BLAKE2B 826b089708dea8a88a522f9889f81e420feb6c616ef7ad826303eca3ab39d4940cbc8bcbfcf61c979dc488d77b4d32fb24c0602b73ed28ea4e8076f369c93388 SHA512 28a5668257eda8cf1ca0395505522eb0f847a4cceee46de067fcfb171baa114876156a7e2671fff93602b2de63c640095e1a940e4725afb24bd14b4fd5f64526 |
| 23 |
DIST libhubbub-0.3.5-src.tar.gz 784526 BLAKE2B a7ba1be85ab01761894a1f2904fbcfbada0280c06ad0834288366f9ce42407a61978bbd775367cc064e367ad78bc792db66ad0e034ae6903c8ad5b44a1fc4d08 SHA512 57feb6ae74381e6b2c5c8a82aef7bcc5faf4a8303e41e39f4ba081a198c6f1225ec9952734ec97f20ba1b4fa3830543e43f4c2d2715b7a8467c19224a968073b |
| 24 |
DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4 |
| 25 |
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58 |
| 26 |
|
| 27 |
diff --git a/net-libs/libhubbub/libhubbub-0.3.5.ebuild b/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild |
| 28 |
similarity index 52% |
| 29 |
rename from net-libs/libhubbub/libhubbub-0.3.5.ebuild |
| 30 |
rename to net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild |
| 31 |
index 8277a2ae87c..d0a20d7641e 100644 |
| 32 |
--- a/net-libs/libhubbub/libhubbub-0.3.5.ebuild |
| 33 |
+++ b/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild |
| 34 |
@@ -1,33 +1,52 @@ |
| 35 |
# Copyright 1999-2018 Gentoo Authors |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
-EAPI=6 |
| 39 |
+EAPI=7 |
| 40 |
|
| 41 |
-NETSURF_BUILDSYSTEM=buildsystem-1.7 |
| 42 |
-inherit netsurf |
| 43 |
+inherit toolchain-funcs |
| 44 |
|
| 45 |
DESCRIPTION="HTML5 compliant parsing library, written in C" |
| 46 |
HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" |
| 47 |
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz" |
| 48 |
|
| 49 |
LICENSE="MIT" |
| 50 |
SLOT="0/${PV}" |
| 51 |
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~m68k-mint" |
| 52 |
IUSE="doc test" |
| 53 |
|
| 54 |
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}] |
| 55 |
+RDEPEND=" |
| 56 |
+ >=dev-libs/libparserutils-0.2.1-r1 |
| 57 |
!net-libs/hubbub" |
| 58 |
DEPEND="${RDEPEND} |
| 59 |
+ dev-util/netsurf-buildsystem |
| 60 |
virtual/pkgconfig |
| 61 |
- test? ( dev-lang/perl |
| 62 |
- >=dev-libs/json-c-0.10-r1[${MULTILIB_USEDEP}] )" |
| 63 |
+ test? ( |
| 64 |
+ dev-lang/perl |
| 65 |
+ >=dev-libs/json-c-0.10-r1 |
| 66 |
+ )" |
| 67 |
|
| 68 |
DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} ) |
| 69 |
|
| 70 |
src_prepare() { |
| 71 |
- # working around broken netsurf eclass |
| 72 |
default |
| 73 |
sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \ |
| 74 |
-i test/tree2.c || die |
| 75 |
+} |
| 76 |
+ |
| 77 |
+_emake() { |
| 78 |
+ source /usr/share/netsurf-buildsystem/gentoo-helpers.sh |
| 79 |
+ netsurf_define_makeconf |
| 80 |
+ emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@ |
| 81 |
+} |
| 82 |
+ |
| 83 |
+src_compile() { |
| 84 |
+ _emake |
| 85 |
+} |
| 86 |
+ |
| 87 |
+src_test() { |
| 88 |
+ _emake test |
| 89 |
+} |
| 90 |
|
| 91 |
- multilib_copy_sources |
| 92 |
+src_install() { |
| 93 |
+ _emake DESTDIR="${ED}" install |
| 94 |
} |
Archives