[gentoo-commits] gentoo-x86 commit in sci-calculators/hexcalc: metadata.xml ChangeLog hexcalc-1.11-r2.ebuild hexcalc-1.11.ebuild

[gentoo-commits] gentoo-x86 commit in sci-calculators/hexcalc: metadata.xml ChangeLog hexcalc-1.11-r2.ebuild hexcalc-1.11.ebuild

[Justin Lecher (jlec)]

jlec        12/04/26 16:40:51

  Modified:             metadata.xml ChangeLog hexcalc-1.11-r2.ebuild
  Removed:              hexcalc-1.11.ebuild
  Log:
  sci-calculators/hexcalc: Move to EAPI=4, remove unnesecarry die
  
  (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-calculators/hexcalc/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/hexcalc/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/hexcalc/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/hexcalc/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	24 Dec 2004 15:16:48 -0000	1.1
+++ metadata.xml	26 Apr 2012 16:40:50 -0000	1.2
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+	<herd>sci</herd>
 </pkgmetadata>



1.14                 sci-calculators/hexcalc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/hexcalc/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/hexcalc/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/hexcalc/ChangeLog?r1=1.13&r2=1.14

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	19 Jul 2010 19:09:21 -0000	1.13
+++ ChangeLog	26 Apr 2012 16:40:50 -0000	1.14
@@ -1,6 +1,10 @@
 # ChangeLog for sci-calculators/hexcalc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/ChangeLog,v 1.13 2010/07/19 19:09:21 josejx Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/ChangeLog,v 1.14 2012/04/26 16:40:50 jlec Exp $
+
+  26 Apr 2012; Justin Lecher <jlec@gentoo.org> -hexcalc-1.11.ebuild,
+  hexcalc-1.11-r2.ebuild, metadata.xml:
+  Move to EAPI=4, remove unnesecarry die
 
   19 Jul 2010; Joseph Jezak <josejx@gentoo.org> hexcalc-1.11-r2.ebuild:
   Marked ppc stable for bug #328439.



1.5                  sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild?r1=1.4&r2=1.5

Index: hexcalc-1.11-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hexcalc-1.11-r2.ebuild	19 Jul 2010 19:09:21 -0000	1.4
+++ hexcalc-1.11-r2.ebuild	26 Apr 2012 16:40:51 -0000	1.5
@@ -1,14 +1,15 @@
-# Copyright 1999-2010 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/hexcalc/hexcalc-1.11-r2.ebuild,v 1.4 2010/07/19 19:09:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/hexcalc/hexcalc-1.11-r2.ebuild,v 1.5 2012/04/26 16:40:51 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A simple hex calculator for X"
 HOMEPAGE="ftp://ftp.x.org/R5contrib/"
 SRC_URI="ftp://ftp.x.org/R5contrib/${PN}.tar.Z"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
@@ -22,7 +23,7 @@
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch ${FILESDIR}/${PN}-* || die
+	epatch "${FILESDIR}"/${PN}-*
 }
 
 src_compile() {
@@ -31,12 +32,10 @@
 		CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
 		CCLINK="$(tc-getCC)" \
-		LDOPTIONS="${LDFLAGS}" \
-		|| die
+		LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
-	dobin hexcalc || die
-	mv hexcalc.man hexcalc.1
-	doman hexcalc.1 || die
+	dobin ${PN}
+	newman ${PN}.{man,1}
 }