summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2014-07-04 15:41:44 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2014-07-04 15:41:44 +0000
commit2663276bdf02a480124b36b1f8f5a33093da065f (patch)
treebfaf5baebffd9fcb3997c518c38573ffbc8911b8 /sci-calculators
parentAdd missing glib-2 dependency (bug #514332), EAPI bump and fix -Waddress warn... (diff)
downloadgentoo-2-2663276bdf02a480124b36b1f8f5a33093da065f.tar.gz
gentoo-2-2663276bdf02a480124b36b1f8f5a33093da065f.tar.bz2
gentoo-2-2663276bdf02a480124b36b1f8f5a33093da065f.zip
Fixed minor issues with desktop file and obsolete configure options (bug #515386)
(Portage version: 2.2.10.1-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-calculators')
-rw-r--r--sci-calculators/qalculate-units/ChangeLog9
-rw-r--r--sci-calculators/qalculate-units/files/qalculate-units-0.9.4-desktop.patch11
-rw-r--r--sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild20
3 files changed, 28 insertions, 12 deletions
diff --git a/sci-calculators/qalculate-units/ChangeLog b/sci-calculators/qalculate-units/ChangeLog
index d6ad39dda38c..29e2e5364614 100644
--- a/sci-calculators/qalculate-units/ChangeLog
+++ b/sci-calculators/qalculate-units/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-calculators/qalculate-units
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-units/ChangeLog,v 1.19 2012/08/04 21:47:13 bicatali Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-units/ChangeLog,v 1.20 2014/07/04 15:41:44 bicatali Exp $
+
+ 04 Jul 2014; Sébastien Fabbro <bicatali@gentoo.org>
+ +files/qalculate-units-0.9.4-desktop.patch, qalculate-units-0.9.4-r2.ebuild:
+ Fixed minor issues with desktop file and obsolete configure options (bug
+ #515386)
04 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
qalculate-units-0.9.4-r2.ebuild:
diff --git a/sci-calculators/qalculate-units/files/qalculate-units-0.9.4-desktop.patch b/sci-calculators/qalculate-units/files/qalculate-units-0.9.4-desktop.patch
new file mode 100644
index 000000000000..121dcbb82833
--- /dev/null
+++ b/sci-calculators/qalculate-units/files/qalculate-units-0.9.4-desktop.patch
@@ -0,0 +1,11 @@
+--- data/qalculate-units.desktop.in.orig 2014-07-04 08:38:13.960379573 -0700
++++ data/qalculate-units.desktop.in 2014-07-04 08:38:29.628489423 -0700
+@@ -4,7 +4,7 @@
+ _GenericName=Unit Converter
+ _Comment=Converts between many different units
+ Exec=qalculate-units
+-Icon=gnome-calc3.png
++Icon=gnome-calc3
+ Terminal=false
+ Type=Application
+ StartupNotify=true
diff --git a/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild b/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild
index 447790246786..2a40b1e10398 100644
--- a/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild
+++ b/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild,v 1.8 2012/08/04 21:47:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/qalculate-units/qalculate-units-0.9.4-r2.ebuild,v 1.9 2014/07/04 15:41:44 bicatali Exp $
-EAPI=4
+EAPI=5
inherit autotools eutils
@@ -16,17 +16,17 @@ IUSE="nls"
KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
- sci-libs/libqalculate
- x11-libs/gtk+:2
+ dev-libs/libxml2:2=
+ sci-libs/libqalculate:0=
+ x11-libs/gdk-pixbuf:2=
+ x11-libs/gtk+:2=
nls? ( sys-devel/gettext )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}"/${P}-cln-config.patch
+ epatch \
+ "${FILESDIR}"/${P}-cln-config.patch \
+ "${FILESDIR}"/${P}-desktop.patch
eautoconf
}
-
-src_configure() {
- econf --disable-clntest
-}