1 |
ssuominen 12/04/18 13:21:59 |
2 |
|
3 |
Modified: gchemutils-0.13.1.ebuild ChangeLog |
4 |
Log: |
5 |
Remove USE="nsplugin" wrt #388887 by Michał Górny. Support for building against net-misc/npapi-sdk is left commented out in the ebuild for example. |
6 |
|
7 |
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.5 sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild?rev=1.5&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild?rev=1.5&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild?r1=1.4&r2=1.5 |
15 |
|
16 |
Index: gchemutils-0.13.1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild,v |
19 |
retrieving revision 1.4 |
20 |
retrieving revision 1.5 |
21 |
diff -u -r1.4 -r1.5 |
22 |
--- gchemutils-0.13.1.ebuild 1 Nov 2011 12:24:48 -0000 1.4 |
23 |
+++ gchemutils-0.13.1.ebuild 18 Apr 2012 13:21:59 -0000 1.5 |
24 |
@@ -1,23 +1,20 @@ |
25 |
-# Copyright 1999-2011 Gentoo Foundation |
26 |
+# Copyright 1999-2012 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild,v 1.4 2011/11/01 12:24:48 pacho Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild,v 1.5 2012/04/18 13:21:59 ssuominen Exp $ |
30 |
|
31 |
-EAPI=3 |
32 |
+EAPI=4 |
33 |
+inherit gnome2 # multilib toolchain-funcs nsplugins |
34 |
|
35 |
-inherit gnome2 multilib versionator |
36 |
- |
37 |
-MPV=$(get_version_component_range 1-2) |
38 |
-MY_PN=gnome-chemistry-utils |
39 |
-MY_P=${MY_PN}-${PV} |
40 |
+MY_P=gnome-chemistry-utils-${PV} |
41 |
|
42 |
DESCRIPTION="C++ classes and Gtk+-2 widgets related to chemistry" |
43 |
HOMEPAGE="http://www.nongnu.org/gchemutils/" |
44 |
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MPV}/${MY_P}.tar.bz2" |
45 |
+SRC_URI="mirror://nongnu/${PN}/${PV%.*}/${MY_P}.tar.bz2" |
46 |
|
47 |
LICENSE="GPL-2" |
48 |
SLOT="0" |
49 |
KEYWORDS="~amd64 ~x86" |
50 |
-IUSE="nls nsplugin" |
51 |
+IUSE="nls" # nsplugin |
52 |
|
53 |
CDEPEND=" |
54 |
gnome-base/libglade:2.0 |
55 |
@@ -25,17 +22,14 @@ |
56 |
x11-libs/gtkglext |
57 |
sci-chemistry/chemical-mime-data |
58 |
sci-chemistry/bodr |
59 |
- sci-chemistry/openbabel |
60 |
- nsplugin? ( || ( |
61 |
- net-libs/xulrunner |
62 |
- www-client/firefox |
63 |
- ) )" |
64 |
+ sci-chemistry/openbabel" |
65 |
RDEPEND="${CDEPEND} |
66 |
gnome-extra/yelp" #271998 |
67 |
DEPEND="${CDEPEND} |
68 |
app-text/gnome-doc-utils |
69 |
dev-util/pkgconfig |
70 |
nls? ( sys-devel/gettext )" |
71 |
+# nsplugin? ( net-misc/npapi-sdk ) |
72 |
|
73 |
S=${WORKDIR}/${MY_P} |
74 |
|
75 |
@@ -45,22 +39,32 @@ |
76 |
--disable-scrollkeeper |
77 |
--disable-dependency-tracking |
78 |
--disable-update-databases |
79 |
- $(use_enable nsplugin mozilla-plugin) |
80 |
+ --disable-mozilla-plugin |
81 |
$(use_enable nls)" |
82 |
+ # $(use_enable nsplugin mozilla-plugin) |
83 |
|
84 |
- if use nsplugin; then |
85 |
- G2CONF="${G2CONF} --with-mozilla-libdir=/usr/$(get_libdir)/nsbrowser/" |
86 |
- fi |
87 |
+ #if use nsplugin; then |
88 |
+ # G2CONF="${G2CONF} --with-mozilla-libdir=/usr/$(get_libdir)/${PLUGINS_DIR}" |
89 |
+ #fi |
90 |
|
91 |
- DOCS="AUTHORS ChangeLog README TODO NEWS" |
92 |
+ DOCS="AUTHORS ChangeLog NEWS README TODO" |
93 |
} |
94 |
|
95 |
src_prepare() { |
96 |
- gnome2_src_prepare |
97 |
- |
98 |
# Drop DEPRECATED flags, bug #388509 |
99 |
sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED::g' \ |
100 |
configure configure.ac || die |
101 |
+ |
102 |
+ gnome2_src_prepare |
103 |
+} |
104 |
+ |
105 |
+src_configure() { |
106 |
+ #if use nsplugin; then |
107 |
+ # export MOZILLA_CFLAGS="$($tc-getPKG_CONFIG) --cflags npapi-sdk)" |
108 |
+ # export MOZILLA_LIBS="" |
109 |
+ #fi |
110 |
+ |
111 |
+ gnome2_src_configure |
112 |
} |
113 |
|
114 |
src_test() { |
115 |
@@ -71,7 +75,7 @@ |
116 |
|
117 |
src_install() { |
118 |
gnome2_src_install |
119 |
- find "${D}" -name "*.la" -delete |
120 |
+ find "${ED}" -name '*.la' -exec rm -f {} + |
121 |
} |
122 |
|
123 |
pkg_postinst() { |
124 |
|
125 |
|
126 |
|
127 |
1.17 sci-chemistry/gchemutils/ChangeLog |
128 |
|
129 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gchemutils/ChangeLog?rev=1.17&view=markup |
130 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gchemutils/ChangeLog?rev=1.17&content-type=text/plain |
131 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/gchemutils/ChangeLog?r1=1.16&r2=1.17 |
132 |
|
133 |
Index: ChangeLog |
134 |
=================================================================== |
135 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/ChangeLog,v |
136 |
retrieving revision 1.16 |
137 |
retrieving revision 1.17 |
138 |
diff -u -r1.16 -r1.17 |
139 |
--- ChangeLog 1 Nov 2011 12:24:48 -0000 1.16 |
140 |
+++ ChangeLog 18 Apr 2012 13:21:59 -0000 1.17 |
141 |
@@ -1,6 +1,10 @@ |
142 |
# ChangeLog for sci-chemistry/gchemutils |
143 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
144 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/ChangeLog,v 1.16 2011/11/01 12:24:48 pacho Exp $ |
145 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
146 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/ChangeLog,v 1.17 2012/04/18 13:21:59 ssuominen Exp $ |
147 |
+ |
148 |
+ 18 Apr 2012; Samuli Suominen <ssuominen@g.o> gchemutils-0.13.1.ebuild: |
149 |
+ Remove USE="nsplugin" wrt #388887 by Michał Górny. Support for building |
150 |
+ against net-misc/npapi-sdk is left commented out in the ebuild for example. |
151 |
|
152 |
01 Nov 2011; Pacho Ramos <pacho@g.o> gchemutils-0.13.1.ebuild: |
153 |
Drop DEPRECATED flags, bug #388509 |