Gentoo Archives: gentoo-commits

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