Adjust .desktop file to get Icon on non-gnome desktops for bug 112614. Drop old version.

Package-Manager: portage-2.1.2.7

6 files changed, 50 insertions, 50 deletions

diff --git a/sci-calculators/galculator/ChangeLog b/sci-calculators/galculator/ChangeLog
index c2fa9564e26b..6e645afe632d 100644
--- a/sci-calculators/galculator/ChangeLog
+++ b/sci-calculators/galculator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-calculators/galculator
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/ChangeLog,v 1.16 2007/05/05 19:39:18 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/ChangeLog,v 1.17 2007/05/14 19:32:21 drac Exp $
+
+*galculator-1.2.5.2-r1 (14 May 2007)
+
+  14 May 2007; Samuli Suominen <drac@gentoo.org> -galculator-1.2.5.ebuild,
+  +galculator-1.2.5.2-r1.ebuild:
+  Adjust .desktop file to get Icon on non-gnome desktops for bug 112614. Drop
+  old version.
 
   05 May 2007; Daniel Gryniewicz <dang@gentoo.org>
   galculator-1.2.5.2.ebuild:
diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest
index 250f11cb9777..ec7ff16013c9 100644
--- a/sci-calculators/galculator/Manifest
+++ b/sci-calculators/galculator/Manifest
@@ -1,34 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST galculator-1.2.5.2.tar.bz2 355372 RMD160 a1378f6958d6f7f7a3434761920753617d524adf SHA1 08b39e3b51f627a6441f4ed57b51fdfff9d67e40 SHA256 f7f14ef981a5a280ac5d7002198ea625a7600e8844f3092ec6c4b01edceadd54
-DIST galculator-1.2.5.tar.bz2 226131 RMD160 70f7cc8a989bcf0321f7d6e0e5303c547a005c51 SHA1 9b3c8ea487dc607f12369ab4e69550aa0c1ad444 SHA256 7e4bf6a6e98f7a86601d2467c76ec0e867541c8cb545fefc1f893df6d3f7c08c
+EBUILD galculator-1.2.5.2-r1.ebuild 843 RMD160 846b05b9533f135146f3d0686c97ba04804c0cbb SHA1 e27e9bbf5c26a3c3a3191815cb7ff3d3b9307462 SHA256 49da5b39c9cc27af7564e4e3ab8e5c7099da40bd39c4956c2e7b510d3ed8e5ab
+MD5 a883e1887cdd9c696780cf37b3fe61eb galculator-1.2.5.2-r1.ebuild 843
+RMD160 846b05b9533f135146f3d0686c97ba04804c0cbb galculator-1.2.5.2-r1.ebuild 843
+SHA256 49da5b39c9cc27af7564e4e3ab8e5c7099da40bd39c4956c2e7b510d3ed8e5ab galculator-1.2.5.2-r1.ebuild 843
 EBUILD galculator-1.2.5.2.ebuild 661 RMD160 32232c297faeb1274f8970c589ca1b653be16a1d SHA1 8fc02172bf7e31f460c61a969f76d62bdae0a9c7 SHA256 5ea5ffb9a9bbbba3a91345107b0ee1c130c7e1b9f32084c042396e18cf8427ba
 MD5 d42554e88c2134ef9c3415671ccca0a2 galculator-1.2.5.2.ebuild 661
 RMD160 32232c297faeb1274f8970c589ca1b653be16a1d galculator-1.2.5.2.ebuild 661
 SHA256 5ea5ffb9a9bbbba3a91345107b0ee1c130c7e1b9f32084c042396e18cf8427ba galculator-1.2.5.2.ebuild 661
-EBUILD galculator-1.2.5.ebuild 659 RMD160 f04eb4028656472637dd65fa189e2efd9a2f6eab SHA1 ab406f4c0a4c96bc40065cd83dafe4983e88426c SHA256 7b13e7172f490108a177c6ef25ea024c436236622f747b6681df127e5ada6a09
-MD5 2df4236879503fda83eb5946007fda67 galculator-1.2.5.ebuild 659
-RMD160 f04eb4028656472637dd65fa189e2efd9a2f6eab galculator-1.2.5.ebuild 659
-SHA256 7b13e7172f490108a177c6ef25ea024c436236622f747b6681df127e5ada6a09 galculator-1.2.5.ebuild 659
-MISC ChangeLog 2752 RMD160 e76fe7954f8186290d2b08612d5d5cc81888dd6d SHA1 4a382a0a2b47468cd7f1b138c093168b7869cab5 SHA256 31d50786c068db700357a2a33ea3aa078cde0a9a724fd5250196d1a466aabc8b
-MD5 69613187948a5bc259748d819f2c1dbc ChangeLog 2752
-RMD160 e76fe7954f8186290d2b08612d5d5cc81888dd6d ChangeLog 2752
-SHA256 31d50786c068db700357a2a33ea3aa078cde0a9a724fd5250196d1a466aabc8b ChangeLog 2752
+MISC ChangeLog 2992 RMD160 6e1690b143b27596f1b70b665e1ec387b676d3a8 SHA1 5c17e5048f8cfb00f86edf4e1a24ccff36f78250 SHA256 d122096e4efd14b4d8af44303ec951c6d351b9206e2c88b7449c41a0e789c5a8
+MD5 e122d8e134388265ff1037fc7b659fb4 ChangeLog 2992
+RMD160 6e1690b143b27596f1b70b665e1ec387b676d3a8 ChangeLog 2992
+SHA256 d122096e4efd14b4d8af44303ec951c6d351b9206e2c88b7449c41a0e789c5a8 ChangeLog 2992
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 f01578219564e3d79cf68895c88b05b5 files/digest-galculator-1.2.5 253
-RMD160 caaad2a04c8a1d317242e3fe3db6a96d3ff16927 files/digest-galculator-1.2.5 253
-SHA256 93b0ad01f50de2696b67b9302321167edb886cd9f82e358159d5554f75eddd37 files/digest-galculator-1.2.5 253
 MD5 d4569772a793d348d1131f6992d36e3b files/digest-galculator-1.2.5.2 259
 RMD160 a3d7d4832af65295849503110ea4a1186394a050 files/digest-galculator-1.2.5.2 259
 SHA256 4e7bd9d5caa1d67a0d9aa7802564ae55e9cb8fc2619ca7c157c30715adfc45ea files/digest-galculator-1.2.5.2 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD4DBQFGPN2FomPajV0RnrERAn6NAJQPzxbPcZM6Liz46dItHkkw0XWZAJ98VdGS
-39WKh8SfahuLhEPM7kAmLg==
-=YYOA
------END PGP SIGNATURE-----
+MD5 d4569772a793d348d1131f6992d36e3b files/digest-galculator-1.2.5.2-r1 259
+RMD160 a3d7d4832af65295849503110ea4a1186394a050 files/digest-galculator-1.2.5.2-r1 259
+SHA256 4e7bd9d5caa1d67a0d9aa7802564ae55e9cb8fc2619ca7c157c30715adfc45ea files/digest-galculator-1.2.5.2-r1 259
diff --git a/sci-calculators/galculator/files/digest-galculator-1.2.5 b/sci-calculators/galculator/files/digest-galculator-1.2.5
deleted file mode 100644
index f7962ab8daa7..000000000000
--- a/sci-calculators/galculator/files/digest-galculator-1.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0f58963a7fd99c7aa7cb9900d4645f59 galculator-1.2.5.tar.bz2 226131
-RMD160 70f7cc8a989bcf0321f7d6e0e5303c547a005c51 galculator-1.2.5.tar.bz2 226131
-SHA256 7e4bf6a6e98f7a86601d2467c76ec0e867541c8cb545fefc1f893df6d3f7c08c galculator-1.2.5.tar.bz2 226131
diff --git a/sci-calculators/galculator/files/digest-galculator-1.2.5.2-r1 b/sci-calculators/galculator/files/digest-galculator-1.2.5.2-r1
new file mode 100644
index 000000000000..5727f2f9d505
--- /dev/null
+++ b/sci-calculators/galculator/files/digest-galculator-1.2.5.2-r1
@@ -0,0 +1,3 @@
+MD5 de1cb7d75c76e4fd9f05f100f303d0a2 galculator-1.2.5.2.tar.bz2 355372
+RMD160 a1378f6958d6f7f7a3434761920753617d524adf galculator-1.2.5.2.tar.bz2 355372
+SHA256 f7f14ef981a5a280ac5d7002198ea625a7600e8844f3092ec6c4b01edceadd54 galculator-1.2.5.2.tar.bz2 355372
diff --git a/sci-calculators/galculator/galculator-1.2.5.2-r1.ebuild b/sci-calculators/galculator/galculator-1.2.5.2-r1.ebuild
new file mode 100644
index 000000000000..62493d710810
--- /dev/null
+++ b/sci-calculators/galculator/galculator-1.2.5.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/galculator-1.2.5.2-r1.ebuild,v 1.1 2007/05/14 19:32:21 drac Exp $
+
+DESCRIPTION="GTK+ based algebraic and RPN calculator."
+HOMEPAGE="http://galculator.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="gnome"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2
+	gnome? ( gnome-base/gnome-desktop )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	use gnome || sed -i -e 's:gnome-calc2.png:calc:' "${S}"/galculator.desktop.in
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
diff --git a/sci-calculators/galculator/galculator-1.2.5.ebuild b/sci-calculators/galculator/galculator-1.2.5.ebuild
deleted file mode 100644
index 6bc78deeb77b..000000000000
--- a/sci-calculators/galculator/galculator-1.2.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/galculator-1.2.5.ebuild,v 1.4 2007/03/25 03:13:51 kugelfang Exp $
-
-DESCRIPTION="A GTK2 based algebraic and RPN calculator"
-HOMEPAGE="http://galculator.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="alpha ~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-1.3.13
-	>=gnome-base/libglade-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	einstall || die
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README THANKS TODO
-}