keyword amd64-linux, x86-linux, removed old

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

8 files changed, 13 insertions, 190 deletions

diff --git a/sci-calculators/gonvert/ChangeLog b/sci-calculators/gonvert/ChangeLog
index 467291e234c6..ce70e535eb8b 100644
--- a/sci-calculators/gonvert/ChangeLog
+++ b/sci-calculators/gonvert/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-calculators/gonvert
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/gonvert/ChangeLog,v 1.11 2011/08/06 21:20:51 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/gonvert/ChangeLog,v 1.12 2012/08/04 21:15:30 bicatali Exp $
+
+  04 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -files/0.2.12-about.patch,
+  -files/0.2.15-glade.patch, -files/0.2.19-paths.patch,
+  -gonvert-0.2.15-r1.ebuild, -gonvert-0.2.19.ebuild, -gonvert-0.2.23.ebuild,
+  gonvert-0.2.25.ebuild:
+  keyword amd64-linux, x86-linux, removed old
 
 *gonvert-0.2.25 (06 Aug 2011)
 
@@ -56,4 +62,3 @@
   +metadata.xml, +gonvert-0.2.12.ebuild:
   Initial commit, closes bug #62492 by Marius Konitzer. Ebuild by Yaakov S
   <yselkowitz@hotmail.com>.
-
diff --git a/sci-calculators/gonvert/files/0.2.12-about.patch b/sci-calculators/gonvert/files/0.2.12-about.patch
deleted file mode 100644
index c98b5fc2c847..000000000000
--- a/sci-calculators/gonvert/files/0.2.12-about.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN gonvert-0.2.11-orig/gonvert gonvert-0.2.11/gonvert
---- gonvert-0.2.11-orig/gonvert	2004-09-03 07:00:20.000000000 -0400
-+++ gonvert-0.2.11/gonvert	2004-11-28 20:05:34.000000000 -0500
-@@ -997,7 +997,7 @@
- books_window = widgets.get_widget('books_window')
- 
- about_image = widgets.get_widget('about_image')
--about_image.set_from_file(homepath  +'pixmaps/gonvert_picture.png')
-+about_image.set_from_file(homepath  +'../pixmaps/gonvert_picture.png')
- versionlabel = widgets.get_widget('versionlabel')
- versionlabel.set_text(version)
- 
diff --git a/sci-calculators/gonvert/files/0.2.15-glade.patch b/sci-calculators/gonvert/files/0.2.15-glade.patch
deleted file mode 100644
index 78e390d37988..000000000000
--- a/sci-calculators/gonvert/files/0.2.15-glade.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gonvert-0.2.15/gonvert gonvert-0.2.15-new/gonvert
---- gonvert-0.2.15/gonvert	2005-12-25 12:55:21.000000000 -0600
-+++ gonvert-0.2.15-new/gonvert	2006-04-05 22:20:26.000000000 -0500
-@@ -730,7 +730,7 @@
- 	homepath=''
- else:
- 	#look for it in the installed directory
--	homepath=sys.path[0] + '/../share/gonvert/'
-+	homepath='/usr/share/gonvert/'
- 
- gladefile=homepath+'gonvert.glade'
- 
diff --git a/sci-calculators/gonvert/files/0.2.19-paths.patch b/sci-calculators/gonvert/files/0.2.19-paths.patch
deleted file mode 100644
index a9740903ae1d..000000000000
--- a/sci-calculators/gonvert/files/0.2.19-paths.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -uNr gonvert-0.2.19.ORIG/gonvert gonvert-0.2.19/gonvert
---- gonvert-0.2.19.ORIG/gonvert	2007-09-14 17:12:10.000000000 +0100
-+++ gonvert-0.2.19/gonvert	2007-09-14 17:10:34.000000000 +0100
-@@ -729,9 +729,9 @@
- if os.path.exists('gonvert.glade'):
- 	homepath=''
- 	pixmapspath='pixmaps/'
--elif os.path.exists('/usr/local/share/gonvert/gonvert.glade'):
--	homepath='/usr/local/share/gonvert/'
--	pixmapspath='/usr/local/share/pixmaps/'
-+elif os.path.exists('/usr/share/gonvert/gonvert.glade'):
-+	homepath='/usr/share/gonvert/'
-+	pixmapspath='/usr/share/pixmaps/'
- else:
- 	#look for it in the installed directory
- 	homepath=sys.path[0] + '/../share/gonvert/'
-diff -uNr gonvert-0.2.19.ORIG/Makefile gonvert-0.2.19/Makefile
---- gonvert-0.2.19.ORIG/Makefile	2007-09-14 17:12:10.000000000 +0100
-+++ gonvert-0.2.19/Makefile	2007-09-14 17:12:56.000000000 +0100
-@@ -4,7 +4,7 @@
- VERSION=$(shell head -3 $(NAME) | grep version | cut -d\" -f2)
- 
- #DESTDIR can be defined when calling make ie. make install DESTDIR=$RPM_BUILD_ROOT
--prefix  = /usr/local
-+prefix  = /usr
- bindir  = $(prefix)/bin
- datadir = $(prefix)/share
- docdir  = $(datadir)/doc
-@@ -18,7 +18,7 @@
- 	install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade
- 	install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/
- 	install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/
--	install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/gnome/apps/Utilities/gonvert.desktop
-+	install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/applications/gonvert.desktop
- 	install -d -m0755 $(DESTDIR)$(docdir)/gonvert/
- 	install -m0644 doc/* $(DESTDIR)$(docdir)/gonvert/
- 
-@@ -27,7 +27,7 @@
- 	install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade
- 	install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/
- 	install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/
--	install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/gnome/apps/Utilities/gonvert.desktop
-+	install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/applications/gonvert.desktop
- 	install -d -m0755 $(DESTDIR)$(docdir)/gonvert/
- 	install -m0644 doc/* $(DESTDIR)$(docdir)/gonvert/
- 	install -m0644 i18n/pl_messages.gmo /usr/share/locale/pl/LC_MESSAGES/gonvert.mo
-@@ -37,7 +37,7 @@
- 	rm -f  $(bindir)/gonvert
- 	rm -rf $(datadir)/gonvert*
- 	rm -rf $(docdir)/gonvert*
--	rm -f /usr/share/gnome/apps/Utilities/$(NAME).desktop
-+	rm -f /usr/share/applications/$(NAME).desktop
- 	rm -f /usr/share/pixmaps/$(NAME).png
- 
- uninstall_pl:
-@@ -45,7 +45,7 @@
- 	rm -f  $(bindir)/gonvert
- 	rm -rf $(datadir)/gonvert*
- 	rm -rf $(docdir)/gonvert*
--	rm -f /usr/share/gnome/apps/Utilities/$(NAME).desktop
-+	rm -f /usr/share/applications/$(NAME).desktop
- 	rm -f /usr/share/pixmaps/$(NAME).png
- 	rm -f /usr/share/locale/pl/LC_MESSAGES/gonvert.mo
- 
diff --git a/sci-calculators/gonvert/gonvert-0.2.15-r1.ebuild b/sci-calculators/gonvert/gonvert-0.2.15-r1.ebuild
deleted file mode 100644
index add82cbf7107..000000000000
--- a/sci-calculators/gonvert/gonvert-0.2.15-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/gonvert/gonvert-0.2.15-r1.ebuild,v 1.3 2011/03/02 21:19:45 jlec Exp $
-
-EAPI="1"
-
-inherit eutils
-
-DESCRIPTION="Unit conversion utility written in PyGTK"
-HOMEPAGE="http://unihedron.com/projects/gonvert/gonvert.php"
-SRC_URI="http://unihedron.com/projects/gonvert/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-
-DEPEND="dev-python/pygtk:2"
-RDEPEND="${DEPEND}"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/0.2.12-about.patch"
-	epatch "${FILESDIR}/0.2.15-glade.patch"
-}
-
-src_install () {
-	make install DESTDIR="${D}" prefix=/usr || die
-	rm -fr "${D}/usr/share/doc/${PN}"
-	dodoc doc/CHANGELOG doc/FAQ doc/README doc/THANKS doc/TODO
-}
diff --git a/sci-calculators/gonvert/gonvert-0.2.19.ebuild b/sci-calculators/gonvert/gonvert-0.2.19.ebuild
deleted file mode 100644
index 1d1c7cf54f36..000000000000
--- a/sci-calculators/gonvert/gonvert-0.2.19.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/gonvert/gonvert-0.2.19.ebuild,v 1.3 2011/03/02 21:19:45 jlec Exp $
-
-EAPI="1"
-
-inherit eutils
-
-DESCRIPTION="Unit conversion utility written in PyGTK"
-HOMEPAGE="http://unihedron.com/projects/gonvert/gonvert.php"
-SRC_URI="http://unihedron.com/projects/gonvert/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-
-DEPEND="dev-python/pygtk:2"
-RDEPEND="${DEPEND}"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-paths.patch"
-}
-
-src_install () {
-	make install DESTDIR="${D}" prefix=/usr || die
-	rm -fr "${D}/usr/share/doc/${PN}"
-	dodoc doc/CHANGELOG doc/FAQ doc/README doc/THANKS doc/TODO
-}
diff --git a/sci-calculators/gonvert/gonvert-0.2.23.ebuild b/sci-calculators/gonvert/gonvert-0.2.23.ebuild
deleted file mode 100644
index af211c5589d4..000000000000
--- a/sci-calculators/gonvert/gonvert-0.2.23.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/gonvert/gonvert-0.2.23.ebuild,v 1.2 2011/03/02 21:19:45 jlec Exp $
-
-EAPI="1"
-
-inherit eutils
-
-DESCRIPTION="Unit conversion utility written in PyGTK"
-HOMEPAGE="http://unihedron.com/projects/gonvert/gonvert.php"
-SRC_URI="http://unihedron.com/projects/gonvert/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-
-DEPEND="dev-python/pygtk:2"
-RDEPEND="${DEPEND}"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PV}-paths.patch"
-}
-
-src_install () {
-	make install DESTDIR="${D}" prefix=/usr || die
-	rm -fr "${D}/usr/share/doc/${PN}"
-	dodoc doc/CHANGELOG doc/FAQ doc/README doc/THANKS doc/TODO
-}
diff --git a/sci-calculators/gonvert/gonvert-0.2.25.ebuild b/sci-calculators/gonvert/gonvert-0.2.25.ebuild
index bb2b5de06b46..899ffbedf640 100644
--- a/sci-calculators/gonvert/gonvert-0.2.25.ebuild
+++ b/sci-calculators/gonvert/gonvert-0.2.25.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/gonvert/gonvert-0.2.25.ebuild,v 1.1 2011/08/06 21:20:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/gonvert/gonvert-0.2.25.ebuild,v 1.2 2012/08/04 21:15:30 bicatali Exp $
 
 EAPI=4
 
 inherit eutils
 
 DESCRIPTION="Unit conversion utility written in PyGTK"
-HOMEPAGE="http://unihedron.com/projects/gonvert/gonvert.php"
+HOMEPAGE="http://unihedron.com/projects/gonvert/index.php"
 SRC_URI="http://unihedron.com/projects/gonvert/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="dev-python/pygtk:2"
@@ -23,7 +23,7 @@ src_prepare () {
 }
 
 src_install () {
-	emake install DESTDIR="${D}" prefix=/usr
+	emake install DESTDIR="${D}" prefix="${EPREFIX}/usr"
 	rm -fr "${ED}/usr/share/doc/${PN}"
 	dodoc doc/CHANGELOG doc/FAQ doc/README doc/THANKS doc/TODO
 }