Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/hubbub: ChangeLog hubbub-0.1.2.ebuild
Date: Thu, 28 Feb 2013 07:28:09
Message-Id: 20130228072803.3CD732171D@flycatcher.gentoo.org
1 xmw 13/02/28 07:28:03
2
3 Modified: ChangeLog hubbub-0.1.2.ebuild
4 Log:
5 netsurf eclass preparation. Fix enum comparision and unused vars.
6
7 (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
8
9 Revision Changes Path
10 1.4 net-libs/hubbub/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/hubbub/ChangeLog?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/hubbub/ChangeLog?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/hubbub/ChangeLog?r1=1.3&r2=1.4
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-libs/hubbub/ChangeLog,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- ChangeLog 18 Jul 2012 14:24:39 -0000 1.3
23 +++ ChangeLog 28 Feb 2013 07:28:03 -0000 1.4
24 @@ -1,6 +1,10 @@
25 # ChangeLog for net-libs/hubbub
26 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-libs/hubbub/ChangeLog,v 1.3 2012/07/18 14:24:39 mr_bones_ Exp $
28 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/net-libs/hubbub/ChangeLog,v 1.4 2013/02/28 07:28:03 xmw Exp $
30 +
31 + 28 Feb 2013; Michael Weber <xmw@g.o> hubbub-0.1.2.ebuild,
32 + +files/hubbub-0.1.2-error.patch:
33 + netsurf eclass preparation. Fix enum comparision and unused vars.
34
35 18 Jul 2012; Michael Sterrett <mr_bones_@g.o> hubbub-0.1.2.ebuild:
36 add missing test to IUSE
37
38
39
40 1.4 net-libs/hubbub/hubbub-0.1.2.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/hubbub/hubbub-0.1.2.ebuild?rev=1.4&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/hubbub/hubbub-0.1.2.ebuild?rev=1.4&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/hubbub/hubbub-0.1.2.ebuild?r1=1.3&r2=1.4
45
46 Index: hubbub-0.1.2.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/net-libs/hubbub/hubbub-0.1.2.ebuild,v
49 retrieving revision 1.3
50 retrieving revision 1.4
51 diff -u -r1.3 -r1.4
52 --- hubbub-0.1.2.ebuild 18 Jul 2012 14:24:39 -0000 1.3
53 +++ hubbub-0.1.2.ebuild 28 Feb 2013 07:28:03 -0000 1.4
54 @@ -1,10 +1,10 @@
55 -# Copyright 1999-2012 Gentoo Foundation
56 +# Copyright 1999-2013 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/net-libs/hubbub/hubbub-0.1.2.ebuild,v 1.3 2012/07/18 14:24:39 mr_bones_ Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/net-libs/hubbub/hubbub-0.1.2.ebuild,v 1.4 2013/02/28 07:28:03 xmw Exp $
60
61 -EAPI=4
62 +EAPI=5
63
64 -inherit multilib toolchain-funcs
65 +inherit eutils multilib toolchain-funcs
66
67 DESCRIPTION="HTML5 compliant parsing library, written in C"
68 HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
69 @@ -13,7 +13,7 @@
70 LICENSE="MIT"
71 SLOT="0"
72 KEYWORDS="~amd64 ~arm"
73 -IUSE="doc static-libs test"
74 +IUSE="debug doc static-libs test"
75
76 RDEPEND="dev-libs/libparserutils"
77 DEPEND="${RDEPEND}
78 @@ -23,35 +23,55 @@
79 test? ( dev-lang/perl
80 dev-libs/json-c )"
81
82 -# json_object_get_string_len does not exist
83 -RESTRICT="test"
84 +RESTRICT=test
85 +
86 +pkg_setup(){
87 + netsurf_src_prepare() {
88 + sed -e "/^CCOPT :=/s:=.*:=:" \
89 + -e "/^CCNOOPT :=/s:=.*:=:" \
90 + -e "/^CCDBG :=/s:=.*:=:" \
91 + -i build/makefiles/Makefile.{gcc,clang} || die
92 + sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
93 + -i Makefile || die
94 + sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
95 + -i ${NETSURF_PKGCONFIG:-${PN}}.pc.in || die
96 + }
97 + netsurf_src_configure() {
98 + echo "Q := " >> Makefile.config
99 + echo "CC := $(tc-getCC)" >> Makefile.config
100 + echo "AR := $(tc-getAR)" >> Makefile.config
101 + }
102 +
103 + netsurf_make() {
104 + emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@"
105 + use static-libs && \
106 + emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@"
107 + }
108 +}
109
110 src_prepare() {
111 - sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
112 - -e "s:-Werror::g" \
113 - -i Makefile || die
114 - sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
115 - -i lib${PN}.pc.in || die
116 - echo "Q := " >> Makefile.config.override
117 - echo "CC := $(tc-getCC)" >> Makefile.config.override
118 - echo "AR := $(tc-getAR)" >> Makefile.config.override
119 + NETSURF_PKGCONFIG=lib${PN}
120 + netsurf_src_prepare
121 +
122 + epatch "${FILESDIR}"/${P}-error.patch
123 +}
124 +
125 +src_configure() {
126 + netsurf_src_configure
127 }
128
129 src_compile() {
130 - emake COMPONENT_TYPE=lib-shared
131 - use static-libs && emake COMPONENT_TYPE=lib-static
132 + netsurf_make
133 +
134 use doc && emake docs
135 }
136
137 src_test() {
138 - emake COMPONENT_TYPE=lib-shared test
139 - use static-libs && emake COMPONENT_TYPE=lib-static test
140 + netsurf_make test
141 }
142
143 src_install() {
144 - emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-shared install
145 - use static-libs && \
146 - emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-static install
147 + netsurf_make DESTDIR="${D}" PREFIX=/usr install
148
149 dodoc README docs/{Architecture,Macros,Todo,Treebuilder,Updated}
150 use doc && dohtml build/docs/html/*
Report Message
Find on MARC Find on Google Groups