Remove unnecessary USE="gnome" and sed for .desktop entry.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 14 insertions, 109 deletions

diff --git a/sci-calculators/galculator/ChangeLog b/sci-calculators/galculator/ChangeLog
index 0ce68b4f35d9..fb94197de6f2 100644
--- a/sci-calculators/galculator/ChangeLog
+++ b/sci-calculators/galculator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-calculators/galculator
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/ChangeLog,v 1.28 2010/01/11 17:46:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/ChangeLog,v 1.29 2010/06/22 12:56:56 ssuominen Exp $
+
+  22 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  galculator-1.3.4.ebuild:
+  Remove unnecessary USE="gnome" and sed for .desktop entry.
 
   11 Jan 2010; Raúl Porcel <armin76@gentoo.org> galculator-1.3.4.ebuild:
   alpha stable wrt #297422
diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest
index 62c830f33c83..02f7042163a4 100644
--- a/sci-calculators/galculator/Manifest
+++ b/sci-calculators/galculator/Manifest
@@ -1,9 +1,4 @@
-DIST galculator-1.2.5.2.tar.bz2 355372 RMD160 a1378f6958d6f7f7a3434761920753617d524adf SHA1 08b39e3b51f627a6441f4ed57b51fdfff9d67e40 SHA256 f7f14ef981a5a280ac5d7002198ea625a7600e8844f3092ec6c4b01edceadd54
-DIST galculator-1.3.1.tar.bz2 382382 RMD160 3130c322cb68ddfc899b198a03f4c730c9f94c76 SHA1 2f006f63941f5b647613ed7173a48cd41885c2a6 SHA256 645e5555b7f060f374f2d411d1198313b3008315983a70453e4eb05874f8353f
 DIST galculator-1.3.4.tar.bz2 393759 RMD160 e789e87b78c9b40f55f2a59bd0e2f0ebbda6738c SHA1 85ba3af2cbe1137e6e98b8bb55666bdd8f23cb07 SHA256 9d6c6f13d9249719d1af71f45f97f64d70aefb959d3bfe2cd375e076d4c5943d
-EBUILD galculator-1.2.5.2-r1.ebuild 843 RMD160 846b05b9533f135146f3d0686c97ba04804c0cbb SHA1 e27e9bbf5c26a3c3a3191815cb7ff3d3b9307462 SHA256 49da5b39c9cc27af7564e4e3ab8e5c7099da40bd39c4956c2e7b510d3ed8e5ab
-EBUILD galculator-1.2.5.2.ebuild 661 RMD160 32232c297faeb1274f8970c589ca1b653be16a1d SHA1 8fc02172bf7e31f460c61a969f76d62bdae0a9c7 SHA256 5ea5ffb9a9bbbba3a91345107b0ee1c130c7e1b9f32084c042396e18cf8427ba
-EBUILD galculator-1.3.1.ebuild 1462 RMD160 f828d6f58a852bf4e8d4881df66fd5f3dec2e68b SHA1 2eba7b664e3482122ea313f8ab498ab8eb303077 SHA256 7cbec39347d7e1ff6b20fb86170bbb48cbbdd30c95d84c047a4e798d55239ded
-EBUILD galculator-1.3.4.ebuild 970 RMD160 de8bfde74b790c5d64206d261c0f0618157f4917 SHA1 940614108a2c08a164a03ab300d244eb9d1235c6 SHA256 66bf360728dabe4ca5f742dd14dd0f3566379e7c660f9e2f06b7d58440578453
-MISC ChangeLog 4390 RMD160 0e6500b00bb1c2c5f83e00ade4a580132735659a SHA1 826dc480abf24d4a3eb95210d6596b4c3fc43f4b SHA256 57a541f51f6c67b13beec13785e10b4675244cab6905f3ef710b5502227dcb10
+EBUILD galculator-1.3.4.ebuild 810 RMD160 e0922568a0dd094c702e8df1919047216b442655 SHA1 ccab7ba38085fb51226fea647aeaae9de833bb68 SHA256 2a452af77362c2cbcf7c227f757f6c8e64d8eda4b3932baefc8ca77b9a824c9b
+MISC ChangeLog 4535 RMD160 0b445751a1bbc981be634694dd8f6373f5525705 SHA1 7980bcb4db1a63d87da0b4482392589bd3f3ded2 SHA256 f7e4f829eb3b98db98ee508d553bf7c2706760cc6c54c4cd0da6c58385ec1baf
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/sci-calculators/galculator/galculator-1.2.5.2-r1.ebuild b/sci-calculators/galculator/galculator-1.2.5.2-r1.ebuild
deleted file mode 100644
index 62493d710810..000000000000
--- a/sci-calculators/galculator/galculator-1.2.5.2-r1.ebuild
+++ /dev/null
@@ -1,28 +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.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.2.ebuild b/sci-calculators/galculator/galculator-1.2.5.2.ebuild
deleted file mode 100644
index f36c95c697af..000000000000
--- a/sci-calculators/galculator/galculator-1.2.5.2.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.2.ebuild,v 1.7 2007/05/05 19:39:18 dang 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 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	einstall || die
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README THANKS TODO
-}
diff --git a/sci-calculators/galculator/galculator-1.3.1.ebuild b/sci-calculators/galculator/galculator-1.3.1.ebuild
deleted file mode 100644
index 98b81cff108e..000000000000
--- a/sci-calculators/galculator/galculator-1.3.1.ebuild
+++ /dev/null
@@ -1,40 +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.3.1.ebuild,v 1.5 2007/11/17 13:22:46 nixnut 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
-	# Fix tests
-	echo "about.glade" >> "${S}/po/POTFILES.skip"
-	echo "basic_buttons.glade" >> "${S}/po/POTFILES.skip"
-	echo "classic_view.glade" >> "${S}/po/POTFILES.skip"
-	echo "dispctrl_bottom.glade" >> "${S}/po/POTFILES.skip"
-	echo "dispctrl_right.glade" >> "${S}/po/POTFILES.skip"
-	echo "dispctrl_right_vertical.glade" >> "${S}/po/POTFILES.skip"
-	echo "main_frame.glade" >> "${S}/po/POTFILES.skip"
-	echo "paper_view.glade" >> "${S}/po/POTFILES.skip"
-	echo "prefs.glade" >> "${S}/po/POTFILES.skip"
-	echo "scientific_buttons.glade" >> "${S}/po/POTFILES.skip"
-	echo "ui/dispctrl_right_vertical.glade" >> "${S}/po/POTFILES.skip"
-}
-
-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.3.4.ebuild b/sci-calculators/galculator/galculator-1.3.4.ebuild
index 8f60ae3ed95c..68911168b941 100644
--- a/sci-calculators/galculator/galculator-1.3.4.ebuild
+++ b/sci-calculators/galculator/galculator-1.3.4.ebuild
@@ -1,31 +1,29 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/galculator-1.3.4.ebuild,v 1.6 2010/01/11 17:46:54 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/galculator/galculator-1.3.4.ebuild,v 1.7 2010/06/22 12:56:56 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 
 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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="gnome"
+IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.6
-	>=gnome-base/libglade-2
-	gnome? ( gnome-base/gnome-desktop )"
+	>=gnome-base/libglade-2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	use gnome || sed -i -e 's:gnome-calc2.png:calc:' "${S}"/galculator.desktop.in
 	# Fix tests
 	echo ui/*.glade | tr -t ' ' '\n' >> po/POTFILES.in
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
 }