| 1 |
xmw 13/02/27 09:44:36 |
| 2 |
|
| 3 |
Modified: libcss-0.1.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
netsurf eclass preparation. Fix enum comparison. |
| 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.7 dev-libs/libcss/libcss-0.1.2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libcss/libcss-0.1.2.ebuild?rev=1.7&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libcss/libcss-0.1.2.ebuild?rev=1.7&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libcss/libcss-0.1.2.ebuild?r1=1.6&r2=1.7 |
| 15 |
|
| 16 |
Index: libcss-0.1.2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libcss/libcss-0.1.2.ebuild,v |
| 19 |
retrieving revision 1.6 |
| 20 |
retrieving revision 1.7 |
| 21 |
diff -u -r1.6 -r1.7 |
| 22 |
--- libcss-0.1.2.ebuild 11 Nov 2012 21:23:41 -0000 1.6 |
| 23 |
+++ libcss-0.1.2.ebuild 27 Feb 2013 09:44:36 -0000 1.7 |
| 24 |
@@ -1,10 +1,10 @@ |
| 25 |
-# Copyright 1999-2012 Gentoo Foundation |
| 26 |
+# Copyright 1999-2013 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/libcss-0.1.2.ebuild,v 1.6 2012/11/11 21:23:41 xmw Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/libcss-0.1.2.ebuild,v 1.7 2013/02/27 09:44:36 xmw Exp $ |
| 30 |
|
| 31 |
-EAPI=4 |
| 32 |
+EAPI=5 |
| 33 |
|
| 34 |
-inherit multilib toolchain-funcs |
| 35 |
+inherit eutils multilib toolchain-funcs |
| 36 |
|
| 37 |
DESCRIPTION="CSS parser and selection engine, written in C" |
| 38 |
HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" |
| 39 |
@@ -13,39 +13,60 @@ |
| 40 |
LICENSE="MIT" |
| 41 |
SLOT="0" |
| 42 |
KEYWORDS="~amd64 ~arm" |
| 43 |
-IUSE="static-libs test" |
| 44 |
+IUSE="debug static-libs test" |
| 45 |
|
| 46 |
RDEPEND="dev-libs/libparserutils |
| 47 |
dev-libs/libwapcaplet" |
| 48 |
DEPEND="${RDEPEND} |
| 49 |
test? ( dev-lang/perl )" |
| 50 |
|
| 51 |
+pkg_setup(){ |
| 52 |
+ netsurf_src_prepare() { |
| 53 |
+ sed -e "/^CCOPT :=/s:=.*:=:" \ |
| 54 |
+ -e "/^CCNOOPT :=/s:=.*:=:" \ |
| 55 |
+ -e "/^CCDBG :=/s:=.*:=:" \ |
| 56 |
+ -i build/makefiles/Makefile.{gcc,clang} || die |
| 57 |
+ sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \ |
| 58 |
+ -i Makefile || die |
| 59 |
+ sed -e "/^libdir/s:/lib:/$(get_libdir):g" \ |
| 60 |
+ -i ${PN}.pc.in || die |
| 61 |
+ } |
| 62 |
+ netsurf_src_configure() { |
| 63 |
+ echo "Q := " >> Makefile.config |
| 64 |
+ echo "CC := $(tc-getCC)" >> Makefile.config |
| 65 |
+ echo "AR := $(tc-getAR)" >> Makefile.config |
| 66 |
+ } |
| 67 |
+ |
| 68 |
+ netsurf_make() { |
| 69 |
+ emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@" |
| 70 |
+ use static-libs && \ |
| 71 |
+ emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@" |
| 72 |
+ } |
| 73 |
+} |
| 74 |
+ |
| 75 |
src_prepare() { |
| 76 |
- sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \ |
| 77 |
- -e "s:-Werror::g" \ |
| 78 |
- -i Makefile || die |
| 79 |
- sed -e "/^libdir/s:/lib:/$(get_libdir):g" \ |
| 80 |
- -i ${PN}.pc.in || die |
| 81 |
- sed -e "s/\$\$(HOST_CC)/$(tc-getBUILD_CC)/g" \ |
| 82 |
+ netsurf_src_prepare |
| 83 |
+ |
| 84 |
+ sed -e 's/x86_64-pc-linux-gnu-gcc/$(CC)/' \ |
| 85 |
-i src/parse/properties/Makefile || die |
| 86 |
- echo "Q := " >> Makefile.config.override |
| 87 |
- echo "CC := $(tc-getCC)" >> Makefile.config.override |
| 88 |
- echo "AR := $(tc-getAR)" >> Makefile.config.override |
| 89 |
+ |
| 90 |
+ epatch "${FILESDIR}"/${P}-enum-compare.patch |
| 91 |
+} |
| 92 |
+ |
| 93 |
+src_configure() { |
| 94 |
+ netsurf_src_configure |
| 95 |
} |
| 96 |
|
| 97 |
src_compile() { |
| 98 |
- emake COMPONENT_TYPE=lib-shared |
| 99 |
- use static-libs && emake COMPONENT_TYPE=lib-static |
| 100 |
+ netsurf_make |
| 101 |
} |
| 102 |
|
| 103 |
src_test() { |
| 104 |
- emake COMPONENT_TYPE=lib-shared test |
| 105 |
- use static-libs && emake COMPONENT_TYPE=lib-static test |
| 106 |
+ netsurf_make test |
| 107 |
} |
| 108 |
|
| 109 |
src_install() { |
| 110 |
- emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-shared install |
| 111 |
- use static-libs && \ |
| 112 |
- emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-static install |
| 113 |
+ netsurf_make DESTDIR="${D}" PREFIX=/usr install |
| 114 |
+ |
| 115 |
dodoc README |
| 116 |
} |
| 117 |
|
| 118 |
|
| 119 |
|
| 120 |
1.7 dev-libs/libcss/ChangeLog |
| 121 |
|
| 122 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libcss/ChangeLog?rev=1.7&view=markup |
| 123 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libcss/ChangeLog?rev=1.7&content-type=text/plain |
| 124 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libcss/ChangeLog?r1=1.6&r2=1.7 |
| 125 |
|
| 126 |
Index: ChangeLog |
| 127 |
=================================================================== |
| 128 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libcss/ChangeLog,v |
| 129 |
retrieving revision 1.6 |
| 130 |
retrieving revision 1.7 |
| 131 |
diff -u -r1.6 -r1.7 |
| 132 |
--- ChangeLog 11 Nov 2012 21:23:41 -0000 1.6 |
| 133 |
+++ ChangeLog 27 Feb 2013 09:44:36 -0000 1.7 |
| 134 |
@@ -1,6 +1,10 @@ |
| 135 |
# ChangeLog for dev-libs/libcss |
| 136 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 137 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/ChangeLog,v 1.6 2012/11/11 21:23:41 xmw Exp $ |
| 138 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 139 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcss/ChangeLog,v 1.7 2013/02/27 09:44:36 xmw Exp $ |
| 140 |
+ |
| 141 |
+ 27 Feb 2013; Michael Weber <xmw@g.o> libcss-0.1.2.ebuild, |
| 142 |
+ +files/libcss-0.1.2-enum-compare.patch: |
| 143 |
+ netsurf eclass preparation. Fix enum comparison. |
| 144 |
|
| 145 |
11 Nov 2012; Michael Weber <xmw@g.o> libcss-0.1.2.ebuild: |
| 146 |
Cross compile fix (bug 431884, James Le Cuirot) |
Archives