summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2014-07-04 15:41:54 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2014-07-04 15:41:54 +0000
commitfa2faf98d51065b5497d71107f25ac07eb82466f (patch)
tree6ca710ad044332b73199791c1e78f9896e58acd1 /sci-calculators
parentAdd missing glib-2 dependency (bug #514332), EAPI bump and fix -Waddress warn... (diff)
downloadhistorical-fa2faf98d51065b5497d71107f25ac07eb82466f.tar.gz
historical-fa2faf98d51065b5497d71107f25ac07eb82466f.tar.bz2
historical-fa2faf98d51065b5497d71107f25ac07eb82466f.zip
Fixed minor issues with desktop file and obsolete configure options (bug #515386)
Package-Manager: portage-2.2.10.1-prefix/cvs/Linux x86_64 Manifest-Sign-Key: 0x13CB1360
Diffstat (limited to 'sci-calculators')
-rw-r--r--sci-calculators/qalculate-units/ChangeLog9
-rw-r--r--sci-calculators/qalculate-units/Manifest15
-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
4 files changed, 36 insertions, 19 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/Manifest b/sci-calculators/qalculate-units/Manifest
index 2f5885238f77..ef3c6c5a01a4 100644
--- a/sci-calculators/qalculate-units/Manifest
+++ b/sci-calculators/qalculate-units/Manifest
@@ -2,14 +2,15 @@
Hash: SHA256
AUX qalculate-units-0.9.4-cln-config.patch 8447 SHA256 ca2e2acc2c554436f9463a149df4f209badd8d93bf32909bd4308c55756ead5c SHA512 ccf3f31fba55daeef24d8f13188e6f159773f5fd9a7447819b47de5e0da1acba2417b286eeb8e115da31f6db3dc8003b33c670b8b036baeab02ed17fc42e8865 WHIRLPOOL e5877c4ff342e8d632528bbee76329decc77abaa8536080409f4eb3bb1d7b22a8c7babf23109c0ea83c2ce3a3828a37083c60dac1ba219b98a04bb67ea5dca2e
-DIST qalculate-units-0.9.4.tar.gz 375642 SHA256 1f0269c15a61d69e209ebdc4d38c1812c53a1becb8e9335ef2d5539385939398
-EBUILD qalculate-units-0.9.4-r2.ebuild 744 SHA256 2dd18c49bd0346b9c91fb2dfb590ba4836d5fa64a9d75625417227b0b85a475e SHA512 594ffc5f9c5535d73045bbb782829e134274b100aa0b95385da6ecc329f2c67db1c84e39cf494e012bbd65192e7566bc7b6e592225436cdf723b31322366a404 WHIRLPOOL e49e332fca941314b0ed0486b53c507402157b46b4bd421184eff6336b4d50e2001868455587867ca52af7944220fd35acd4c9b86faabccb750f6f498204c277
-MISC ChangeLog 3342 SHA256 5f38cb61a995acaf17c378f35ca96ac66f5de9f4b3c6707220dea440736ebde9 SHA512 f95ff0bdc9ae74a6db974fcb9cc13ef566f28848a534e8f63108fad045467113d1571062f3b05727cc96a6aee91198b88f9c870a177e99e50236279b3f709d35 WHIRLPOOL dca5bc1a606464efafbf847ece999b2beeb5357bc51909aec9259ec357479529610fa92c4fdde13f99aa579a3f4e98f894baedeb5f1ab35f8d54933018ac7df9
+AUX qalculate-units-0.9.4-desktop.patch 358 SHA256 2c969f86441bdc959c0e0be8c737c12b836a105441507a637ac6dae3c659763b SHA512 defff8226b2b33efe49f4439d9650fa4775728c8b2643e17b4297478c77bf3090c18705c7658545b0ff09fbf11f23e28366d20a85ef9ad8cb0c4365b89c85924 WHIRLPOOL 805c4485ebbc2660d3d5d2cfbbe94d2e34f94d928a1a5380478a889ba3da9f7b63c1fcef22fe74f7755ed20dc4cfe4170d7de0d0a3ead2e77adf78734bd65290
+DIST qalculate-units-0.9.4.tar.gz 375642 SHA256 1f0269c15a61d69e209ebdc4d38c1812c53a1becb8e9335ef2d5539385939398 SHA512 14a3430275f4c398bf63fddb54ec029b26132883dbd59dbdae2dd5d45e56df0b624f051bca02fa3d1fcedab0b265a6744dedb36032535885f3608f6ca3598338 WHIRLPOOL a08fce5c8f96ae44f62a42876e77180e344ec1fe41a07626b80efd28e251c48b48739bdc20593ae492c8e401a4287349851024f93acc2a655b816602597ec2f6
+EBUILD qalculate-units-0.9.4-r2.ebuild 788 SHA256 1a1fb59e98f08d46f5fa48468097049da051afb42075ebecc1f8caaa888b2b2e SHA512 fca9cc19909ebca2b15931b2bd62f68087e177d735d25040d4a14b189bb64e618e54308418cdf5ef317b3e4ffe88e0126733ed126eb3ae1f78852a551b46df42 WHIRLPOOL 6068d7365157a3ae671926e2d52bc35c8754a3ba9d6a1a6097512dc631a88297d1e30b7c5ef89a0580e90e81ba2af79208cc7286ac3b61533e699c8fc44a0937
+MISC ChangeLog 3563 SHA256 b32597fb6a0c19b40b8385b9c0775aa52f5ef36dcbac05b772204bd0e386c20f SHA512 d606fe078cd14991d1a950e8ef687cfd1322d1d96d685eddbdf33943add1b42d3cf18ae90fe35a4702a04561c14bf6b025a689712df415126deabad52204af8e WHIRLPOOL a743b6da6750eaf91a9eb46bee28136d45c57a6c1b6d87b65cae3cac82f6ce195bd830a304e21626887810c634868ecff16d85fef378b48e9cb026b895ff2a27
MISC metadata.xml 156 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 SHA512 5b6997cd90fe19a83f6bdf44de540ea3818a23fdc28fb2a7c1f55746689ebaa2d4b63eba0386da5198def1cb2a8ae1e5d5d4040c43b0fc31237b864ed1400743 WHIRLPOOL c42eafa29279646750c35aac52967303f347b02b61133918480ba236d599dac68bc0ea000d037f69a3398939678fdeecef656801d783e547f14ea76b04ef2863
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
-iEYEAREIAAYFAlAdmGcACgkQ1ycZbhPLE2C3tACeKbyYnWtesf5uefdGMBXncO1S
-sv0An0e6K4bJJtPf72zxL0v3AdG5daF1
-=MATX
+iEYEAREIAAYFAlO2yz4ACgkQ1ycZbhPLE2C34ACfbtbz0yRubL7+E6XDhZGS+lnk
+b+MAnA3dB7pkU054j1IW6YBovnDPzpGF
+=6eyu
-----END PGP SIGNATURE-----
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
-}