Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/lasi: metadata.xml ChangeLog lasi-1.1.1.ebuild
Date: Mon, 20 Feb 2012 09:55:05
Message-Id: 20120220095455.BD7952004B@flycatcher.gentoo.org
1 jlec 12/02/20 09:54:55
2
3 Modified: metadata.xml ChangeLog lasi-1.1.1.ebuild
4 Log:
5 Use PATCHES array and convert mycmakeargs to an array
6
7 (Portage version: 2.2.0_alpha87/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 media-libs/lasi/metadata.xml
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lasi/metadata.xml?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lasi/metadata.xml?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lasi/metadata.xml?r1=1.1&r2=1.2
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/lasi/metadata.xml,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- metadata.xml 21 Oct 2008 11:29:15 -0000 1.1
23 +++ metadata.xml 20 Feb 2012 09:54:55 -0000 1.2
24 @@ -1,9 +1,9 @@
25 <?xml version="1.0" encoding="UTF-8"?>
26 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
27 <pkgmetadata>
28 -<herd>sci</herd>
29 -<herd>graphics</herd>
30 -<longdescription lang="en">
31 + <herd>sci</herd>
32 + <herd>graphics</herd>
33 + <longdescription lang="en">
34 libLASi is a library written by Larry Siden that provides a C++
35 stream output interface for creating Postscript documents that can
36 contain characters from any of the scripts and symbol blocks
37
38
39
40 1.23 media-libs/lasi/ChangeLog
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lasi/ChangeLog?rev=1.23&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lasi/ChangeLog?rev=1.23&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lasi/ChangeLog?r1=1.22&r2=1.23
45
46 Index: ChangeLog
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v
49 retrieving revision 1.22
50 retrieving revision 1.23
51 diff -u -r1.22 -r1.23
52 --- ChangeLog 27 Nov 2011 04:05:57 -0000 1.22
53 +++ ChangeLog 20 Feb 2012 09:54:55 -0000 1.23
54 @@ -1,6 +1,9 @@
55 # ChangeLog for media-libs/lasi
56 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
57 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.22 2011/11/27 04:05:57 bicatali Exp $
58 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
59 +# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/ChangeLog,v 1.23 2012/02/20 09:54:55 jlec Exp $
60 +
61 + 20 Feb 2012; Justin Lecher <jlec@g.o> lasi-1.1.1.ebuild, metadata.xml:
62 + Use PATCHES array and convert mycmakeargs to an array
63
64 *lasi-1.1.1 (27 Nov 2011)
65
66
67
68
69 1.2 media-libs/lasi/lasi-1.1.1.ebuild
70
71 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lasi/lasi-1.1.1.ebuild?rev=1.2&view=markup
72 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lasi/lasi-1.1.1.ebuild?rev=1.2&content-type=text/plain
73 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/lasi/lasi-1.1.1.ebuild?r1=1.1&r2=1.2
74
75 Index: lasi-1.1.1.ebuild
76 ===================================================================
77 RCS file: /var/cvsroot/gentoo-x86/media-libs/lasi/lasi-1.1.1.ebuild,v
78 retrieving revision 1.1
79 retrieving revision 1.2
80 diff -u -r1.1 -r1.2
81 --- lasi-1.1.1.ebuild 27 Nov 2011 04:05:57 -0000 1.1
82 +++ lasi-1.1.1.ebuild 20 Feb 2012 09:54:55 -0000 1.2
83 @@ -1,9 +1,10 @@
84 -# Copyright 1999-2011 Gentoo Foundation
85 +# Copyright 1999-2012 Gentoo Foundation
86 # Distributed under the terms of the GNU General Public License v2
87 -# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/lasi-1.1.1.ebuild,v 1.1 2011/11/27 04:05:57 bicatali Exp $
88 +# $Header: /var/cvsroot/gentoo-x86/media-libs/lasi/lasi-1.1.1.ebuild,v 1.2 2012/02/20 09:54:55 jlec Exp $
89
90 EAPI=4
91 -inherit eutils cmake-utils
92 +
93 +inherit cmake-utils eutils
94
95 MY_PN=libLASi
96 MY_P=${MY_PN}-${PV}
97 @@ -17,17 +18,22 @@
98 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
99 IUSE="doc examples"
100
101 -RDEPEND="x11-libs/pango
102 - media-libs/freetype:2"
103 +RDEPEND="
104 + media-libs/freetype:2
105 + x11-libs/pango"
106 DEPEND="${RDEPEND}
107 dev-util/pkgconfig
108 doc? ( app-doc/doxygen )"
109
110 S=${WORKDIR}/${MY_P}
111
112 +PATCHES=(
113 + "${FILESDIR}"/${PN}-1.1.0-cmake.patch
114 + "${FILESDIR}"/${PN}-1.1.0-pkgconfig.patch
115 + )
116 +
117 src_prepare() {
118 - epatch "${FILESDIR}"/${PN}-1.1.0-cmake.patch
119 - epatch "${FILESDIR}"/${PN}-1.1.0-pkgconfig.patch
120 + base_src_prepare
121 sed -i \
122 -e "s:\/lib$:\/$(get_libdir):" \
123 -e "s/libLASi-\${VERSION}/${PF}/" \
124 @@ -42,9 +48,10 @@
125
126 src_configure() {
127 CMAKE_BUILD_TYPE=None
128 - mycmakeargs="${mycmakeargs}
129 - -DCMAKE_SKIP_RPATH=OFF
130 - -DUSE_RPATH=OFF"
131 - use doc || mycmakeargs="${mycmakeargs} -DDOXYGEN_EXECUTABLE="
132 + local mycmakeargs=(
133 + -DCMAKE_SKIP_RPATH=OFF
134 + -DUSE_RPATH=OFF
135 + )
136 + use doc || mycmakeargs+=( -DDOXYGEN_EXECUTABLE= )
137 cmake-utils_src_configure
138 }