Fix perl-5.18 compatibility, bug#506374, thanks to Kevin Bryan

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

3 files changed, 123 insertions, 1 deletions

diff --git a/app-crypt/tinyca/ChangeLog b/app-crypt/tinyca/ChangeLog
index d7d33d9a1b6a..97bf7fc4bdb6 100644
--- a/app-crypt/tinyca/ChangeLog
+++ b/app-crypt/tinyca/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/tinyca
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tinyca/ChangeLog,v 1.23 2014/08/20 03:36:36 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tinyca/ChangeLog,v 1.24 2014/08/20 03:41:09 alonbl Exp $
+
+*tinyca-2.0.7.5-r2 (20 Aug 2014)
+
+  20 Aug 2014; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/tinyca-2.0.7.5-perl-5.18.patch, +tinyca-2.0.7.5-r2.ebuild:
+  Fix perl-5.18 compatibility, bug#506374, thanks to Kevin Bryan
 
   20 Aug 2014; Alon Bar-Lev <alonbl@gentoo.org> -tinyca-2.0.7.3.ebuild,
   -tinyca-2.0.7.5.ebuild:
diff --git a/app-crypt/tinyca/files/tinyca-2.0.7.5-perl-5.18.patch b/app-crypt/tinyca/files/tinyca-2.0.7.5-perl-5.18.patch
new file mode 100644
index 000000000000..39b3a6e29f4a
--- /dev/null
+++ b/app-crypt/tinyca/files/tinyca-2.0.7.5-perl-5.18.patch
@@ -0,0 +1,47 @@
+--- tinyca2-0.7.5.orig/lib/GUI.pm	2006-07-25 16:12:00.000000000 -0400
+--- tinyca2-0.7.5/lib/GUI.pm	2006-07-25 16:12:00.000000000 -0400
+@@ -978,7 +978,7 @@
+    $piter = $store->append($root);
+    $store->set($piter, 0 => $t);
+ 
+-   for my $l qw(CN EMAIL O OU C ST L) {
++   for my $l (qw(CN EMAIL O OU C ST L)) {
+       if(defined($parsed->{$l})) {
+          if($l eq "OU") {
+             foreach my $ou (@{$parsed->{'OU'}}) {
+@@ -1003,7 +1003,7 @@
+       $piter = $store->append($root);
+       $store->set($piter, 0 => $t);
+    
+-      for my $l qw(CN EMAIL O OU C ST L) {
++      for my $l (qw(CN EMAIL O OU C ST L)) {
+          if(defined($parsed->{'ISSUERDN'}->{$l})) {
+             if($l eq "OU") {
+                foreach my $ou (@{$parsed->{'ISSUERDN'}->{'OU'}}) {
+@@ -1029,7 +1029,7 @@
+       $piter = $store->append($root);
+       $store->set($piter, 0 => $t);
+    
+-      for my $l qw(STATUS NOTBEFORE NOTAFTER) {
++      for my $l (qw(STATUS NOTBEFORE NOTAFTER)) {
+          if(defined($parsed->{$l})) {
+             $citer = $store->append($piter);
+             $store->set($citer, 
+@@ -1045,7 +1045,7 @@
+    $store->set($piter, 0 => $t);
+ 
+ 
+-   for my $l qw(STATUS SERIAL KEYSIZE PK_ALGORITHM SIG_ALGORITHM TYPE) {
++   for my $l (qw(STATUS SERIAL KEYSIZE PK_ALGORITHM SIG_ALGORITHM TYPE)) {
+       if(defined($parsed->{$l})) {
+          $citer = $store->append($piter);
+          $store->set($citer, 
+@@ -1060,7 +1060,7 @@
+       $piter = $store->append($root);
+       $store->set($piter, 0 => $t);
+    
+-      for my $l qw(FINGERPRINTMD5 FINGERPRINTSHA1) {
++      for my $l (qw(FINGERPRINTMD5 FINGERPRINTSHA1)) {
+          if(defined($parsed->{$l})) {
+             $citer = $store->append($piter);
+             $store->set($citer, 
diff --git a/app-crypt/tinyca/tinyca-2.0.7.5-r2.ebuild b/app-crypt/tinyca/tinyca-2.0.7.5-r2.ebuild
new file mode 100644
index 000000000000..1c14efc0eb7c
--- /dev/null
+++ b/app-crypt/tinyca/tinyca-2.0.7.5-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tinyca/tinyca-2.0.7.5-r2.ebuild,v 1.1 2014/08/20 03:41:09 alonbl Exp $
+
+EAPI=5
+
+inherit eutils
+
+MY_P="${PN}${PV/./-}"
+DESCRIPTION="Simple Perl/Tk GUI to manage a small certification authority"
+HOMEPAGE="http://tinyca.sm-zone.net/"
+SRC_URI="http://tinyca.sm-zone.net/${MY_P}.tar.bz2"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+LANGS="en de cs es sv"
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND=">=dev-libs/openssl-0.9.7e
+	dev-perl/Locale-gettext
+	>=virtual/perl-MIME-Base64-2.12
+	>=dev-perl/gtk2-perl-1.072"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0.7.3-compositefix.patch"
+	epatch "${FILESDIR}/${P}-openssl-1.patch"
+	epatch "${FILESDIR}/${P}-perl-5.18.patch"
+	sed -i -e 's:./lib:/usr/share/tinyca/lib:g' \
+		-e 's:./templates:/usr/share/tinyca/templates:g' \
+		-e 's:./locale:/usr/share/locale:g' "${S}/tinyca2"
+}
+
+src_compile() {
+	emake -C po
+}
+
+locale_install() {
+	dodir /usr/share/locale/$@/LC_MESSAGES/
+	insinto /usr/share/locale/$@/LC_MESSAGES/
+	doins locale/$@/LC_MESSAGES/tinyca2.mo
+}
+
+src_install() {
+	exeinto /usr/bin
+	newexe tinyca2 tinyca
+	insinto /usr/share/tinyca/lib
+	doins lib/*.pm
+	insinto /usr/share/tinyca/lib/GUI
+	doins lib/GUI/*.pm
+	insinto /usr/share/tinyca/templates
+	doins templates/*
+	insinto /usr/share/
+	strip-linguas ${LANGS}
+	local l
+	for l in ${LANGS}; do
+		if [ "$l" != "en" ]; then
+			use linguas_$l && locale_install $l
+		fi
+	done
+}