[gentoo-commits] gentoo-x86 commit in app-admin/ec2-ami-tools: ec2-ami-tools-1.4.0.5-r1.ebuild ChangeLog ec2-ami-tools-1.4.0.5.ebuild

[gentoo-commits] gentoo-x86 commit in app-admin/ec2-ami-tools: ec2-ami-tools-1.4.0.5-r1.ebuild ChangeLog ec2-ami-tools-1.4.0.5.ebuild

[Tom Wijsman (tomwij)]

tomwij      13/04/02 22:50:49

  Modified:             ec2-ami-tools-1.4.0.5-r1.ebuild ChangeLog
  Removed:              ec2-ami-tools-1.4.0.5.ebuild
  Log:
  Removal of left behind license file, listed those licenses in the LICENSE variable. Clarified die calls.
  
  (Portage version: 2.1.11.60/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

Revision  Changes    Path
1.2                  app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r1.ebuild?r1=1.1&r2=1.2

Index: ec2-ami-tools-1.4.0.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ec2-ami-tools-1.4.0.5-r1.ebuild	2 Apr 2013 22:37:43 -0000	1.1
+++ ec2-ami-tools-1.4.0.5-r1.ebuild	2 Apr 2013 22:50:49 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r1.ebuild,v 1.1 2013/04/02 22:37:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r1.ebuild,v 1.2 2013/04/02 22:50:49 tomwij Exp $
 
 EAPI="5"
 
@@ -10,7 +10,8 @@
 HOMEPAGE="http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88"
 SRC_URI="http://s3.amazonaws.com/ec2-downloads/${P}.zip"
 
-LICENSE="Amazon"
+LICENSE="Amazon
+	|| ( Ruby GPL-2 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
@@ -26,7 +27,10 @@
 	# be what upstream has been using; since Gentoo supports alternative
 	# implementations as well it is not guaranteed that ruby is ruby18.
 	# There are forks which patch this, but Amazon hasn't patched this yet.
-	sed -i -e '$s:^ruby:exec ruby18:' bin/* || die
+	sed -i -e '$s:^ruby:exec ruby18:' bin/* || die 'Sed failed.'
+
+	# Remove a left behind license file.
+	rm lib/ec2/oem/LICENSE.txt || die 'Removal of LICENSE failed.'
 }
 
 src_install() {



1.14                 app-admin/ec2-ami-tools/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog?r1=1.13&r2=1.14

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	2 Apr 2013 22:37:43 -0000	1.13
+++ ChangeLog	2 Apr 2013 22:50:49 -0000	1.14
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/ec2-ami-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog,v 1.13 2013/04/02 22:37:43 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ChangeLog,v 1.14 2013/04/02 22:50:49 tomwij Exp $
+
+  02 Apr 2013; Tom Wijsman <TomWij@gentoo.org> -ec2-ami-tools-1.4.0.5.ebuild,
+  ec2-ami-tools-1.4.0.5-r1.ebuild:
+  Removal of left behind license file, listed those licenses in the LICENSE
+  variable. Clarified die calls.
 
 *ec2-ami-tools-1.4.0.5-r1 (02 Apr 2013)