summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-05-21 06:41:53 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-05-21 06:41:53 +0000
commit393e1deedef89839baea63699279127ff708d2f9 (patch)
treef692b86871140e144410227538c50038d9bdb837 /sci-calculators
parentRemove || ( ) from LICENSE field because they are all required. Missing glib,... (diff)
downloadgentoo-2-393e1deedef89839baea63699279127ff708d2f9.tar.gz
gentoo-2-393e1deedef89839baea63699279127ff708d2f9.tar.bz2
gentoo-2-393e1deedef89839baea63699279127ff708d2f9.zip
Remove gnome-extra/yelp from runtime dependencies to avoid pulling in vulnerable copy of net-libs/xulrunner wrt #416843; even if this wasn't case the dependency was unnecessary and should be left for gnome's meta package to pull in. EAPI4 while at it, minor cleanups
(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)
Diffstat (limited to 'sci-calculators')
-rw-r--r--sci-calculators/qalculate-gtk/ChangeLog9
-rw-r--r--sci-calculators/qalculate-gtk/qalculate-gtk-0.9.7.ebuild16
2 files changed, 14 insertions, 11 deletions
diff --git a/sci-calculators/qalculate-gtk/ChangeLog b/sci-calculators/qalculate-gtk/ChangeLog
index 68de4aa87ebe..394321025774 100644
--- a/sci-calculators/qalculate-gtk/ChangeLog
+++ b/sci-calculators/qalculate-gtk/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sci-calculators/qalculate-gtk
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-gtk/ChangeLog,v 1.37 2012/05/04 06:52:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-gtk/ChangeLog,v 1.38 2012/05/21 06:41:53 ssuominen Exp $
+
+ 21 May 2012; Samuli Suominen <ssuominen@gentoo.org>
+ qalculate-gtk-0.9.7.ebuild:
+ Remove gnome-extra/yelp from runtime dependencies to avoid pulling in
+ vulnerable copy of net-libs/xulrunner wrt #416843; even if this wasn't case
+ the dependency was unnecessary and should be left for gnome's meta package to
+ pull in.
04 May 2012; Jeff Horelick <jdhore@gentoo.org> qalculate-gtk-0.9.7.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.7.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.7.ebuild
index f31af96d6eea..c58d739518eb 100644
--- a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.7.ebuild
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.7.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.7.ebuild,v 1.8 2012/05/04 06:52:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.7.ebuild,v 1.9 2012/05/21 06:41:53 ssuominen Exp $
-EAPI=2
+EAPI=4
GCONF_DEBUG=no
inherit eutils gnome2
@@ -15,14 +15,11 @@ SLOT="0"
KEYWORDS="amd64 ~hppa ppc sparc x86"
IUSE="gnome"
-RDEPEND="
- >=sci-libs/libqalculate-0.9.7
+RDEPEND=">=sci-libs/libqalculate-0.9.7
>=sci-libs/cln-1.2
x11-libs/gtk+:2
gnome-base/libglade:2.0
- gnome? (
- >=gnome-base/libgnome-2
- gnome-extra/yelp )"
+ gnome? ( >=gnome-base/libgnome-2 )"
DEPEND="${RDEPEND}
app-text/rarian
sys-devel/gettext
@@ -31,12 +28,11 @@ DEPEND="${RDEPEND}
pkg_setup() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
- G2CONF="--disable-dependency-tracking
- $(use_with gnome libgnome)"
+ G2CONF="$(use_with gnome libgnome)"
}
src_prepare() {
- # Required by make check
+ # Required by src_test() and `make check`
echo data/periodictable.glade > po/POTFILES.skip
epatch "${FILESDIR}"/${P}-entry.patch
gnome2_src_prepare