1 |
xmw 13/02/27 08:43:22 |
2 |
|
3 |
Modified: ChangeLog libnsbmp-0.0.3.ebuild |
4 |
Log: |
5 |
netsurf eclass preparation. Restore cross-compile functionality (thanks James Le Cuirot, bug 431884) |
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.2 media-libs/libnsbmp/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libnsbmp/ChangeLog?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libnsbmp/ChangeLog?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libnsbmp/ChangeLog?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libnsbmp/ChangeLog,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- ChangeLog 17 Jul 2012 23:29:19 -0000 1.1 |
23 |
+++ ChangeLog 27 Feb 2013 08:43:22 -0000 1.2 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-libs/libnsbmp |
26 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnsbmp/ChangeLog,v 1.1 2012/07/17 23:29:19 xmw Exp $ |
28 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnsbmp/ChangeLog,v 1.2 2013/02/27 08:43:22 xmw Exp $ |
30 |
+ |
31 |
+ 27 Feb 2013; Michael Weber <xmw@g.o> libnsbmp-0.0.3.ebuild: |
32 |
+ netsurf eclass preparation. Restore cross-compile functionality (thanks James |
33 |
+ Le Cuirot, bug 431884) |
34 |
|
35 |
*libnsbmp-0.0.3 (17 Jul 2012) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.2 media-libs/libnsbmp/libnsbmp-0.0.3.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libnsbmp/libnsbmp-0.0.3.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libnsbmp/libnsbmp-0.0.3.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libnsbmp/libnsbmp-0.0.3.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: libnsbmp-0.0.3.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libnsbmp/libnsbmp-0.0.3.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- libnsbmp-0.0.3.ebuild 17 Jul 2012 23:29:19 -0000 1.1 |
53 |
+++ libnsbmp-0.0.3.ebuild 27 Feb 2013 08:43:22 -0000 1.2 |
54 |
@@ -1,8 +1,8 @@ |
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/media-libs/libnsbmp/libnsbmp-0.0.3.ebuild,v 1.1 2012/07/17 23:29:19 xmw Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnsbmp/libnsbmp-0.0.3.ebuild,v 1.2 2013/02/27 08:43:22 xmw Exp $ |
60 |
|
61 |
-EAPI=4 |
62 |
+EAPI=5 |
63 |
|
64 |
inherit multilib toolchain-funcs |
65 |
|
66 |
@@ -13,34 +13,51 @@ |
67 |
LICENSE="MIT" |
68 |
SLOT="0" |
69 |
KEYWORDS="~amd64 ~arm" |
70 |
-IUSE="static-libs" |
71 |
+IUSE="debug static-libs" |
72 |
|
73 |
RDEPEND="" |
74 |
DEPEND="" |
75 |
|
76 |
+pkg_setup(){ |
77 |
+ netsurf_src_prepare() { |
78 |
+ sed -e "/^CCOPT :=/s:=.*:=:" \ |
79 |
+ -e "/^CCNOOPT :=/s:=.*:=:" \ |
80 |
+ -e "/^CCDBG :=/s:=.*:=:" \ |
81 |
+ -i build/makefiles/Makefile.{gcc,clang} || die |
82 |
+ sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \ |
83 |
+ -i Makefile || die |
84 |
+ sed -e "/^libdir/s:/lib:/$(get_libdir):g" \ |
85 |
+ -i ${PN}.pc.in || die |
86 |
+ } |
87 |
+ netsurf_src_configure() { |
88 |
+ echo "Q := " >> Makefile.config |
89 |
+ echo "CC := $(tc-getCC)" >> Makefile.config |
90 |
+ echo "AR := $(tc-getAR)" >> Makefile.config |
91 |
+ } |
92 |
+ |
93 |
+ netsurf_make() { |
94 |
+ emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@" |
95 |
+ use static-libs && \ |
96 |
+ emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@" |
97 |
+ } |
98 |
+} |
99 |
+ |
100 |
src_prepare() { |
101 |
- sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \ |
102 |
- -e "s:-Werror::g" \ |
103 |
- -i Makefile || die |
104 |
- sed -e "/^libdir/s:/lib:/$(get_libdir):g" \ |
105 |
- -i ${PN}.pc.in || die |
106 |
- echo "Q := " >> Makefile.config.override |
107 |
- echo "CC := $(tc-getCC)" >> Makefile.config.override |
108 |
- echo "AR := $(tc-getAR)" >> Makefile.config.override |
109 |
+ netsurf_src_prepare |
110 |
+} |
111 |
+ |
112 |
+src_configure() { |
113 |
+ netsurf_src_configure |
114 |
} |
115 |
|
116 |
src_compile() { |
117 |
- emake COMPONENT_TYPE=lib-shared |
118 |
- use static-libs && emake COMPONENT_TYPE=lib-static |
119 |
+ netsurf_make |
120 |
} |
121 |
|
122 |
src_test() { |
123 |
- emake COMPONENT_TYPE=lib-shared test |
124 |
- use static-libs && emake COMPONENT_TYPE=lib-static test |
125 |
+ netsurf_make test |
126 |
} |
127 |
|
128 |
src_install() { |
129 |
- emake COMPONENT_TYPE=lib-shared DESTDIR="${D}" PREFIX=/usr install |
130 |
- use static-libs && \ |
131 |
- emake COMPONENT_TYPE=lib-static DESTDIR="${D}" PREFIX=/usr install |
132 |
+ netsurf_make DESTDIR="${D}" PREFIX=/usr install |
133 |
} |