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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 129 insertions, 5 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/Manifest b/app-crypt/tinyca/Manifest
index df4f623dccec..25a8e21798da 100644
--- a/app-crypt/tinyca/Manifest
+++ b/app-crypt/tinyca/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 AUX tinyca-2.0.7.3-compositefix.patch 324 SHA256 d69a311312c46d9b3a0db9464f73d3c0dd1aa303aca0309fc8bfe09af2b9f48e SHA512 0411e13f8a40e60e2b2fa6b095745e465f406da38e7ae5aa1e84e0cd325d012e3bb8aa397f2bd5b6ef2efb8624ae0d4f5dd59f73a562e387856ade211385bc5a WHIRLPOOL 82699af6773096960c4413f6fa7e2402355df74d54965be68dbe0ac65d2f9408b0699789688bab10123918b7e44c2142cfad962d61f4465d8017b891a1b860c4
 AUX tinyca-2.0.7.5-openssl-1.patch 1473 SHA256 47e0944ad8b8f01fa9f74b5b91d68c1afb90c19df173d28d117843f0815f7135 SHA512 62f6368d8759f83b33aa8d19cbd0b816bc2be35a1b1f798b211269a5b0279788edd01f7f4bdf20d453dafc71df250c72adbd9ac5dba276ac1b4f0690fa80c60a WHIRLPOOL 567f9793fd606faef9c86e05b55e9a606a5e5b8415602e212cbccc6f70192256a08b432f70dc296044054ad2a844418e52dc46e26407a89b6525ceb849afebea
+AUX tinyca-2.0.7.5-perl-5.18.patch 1743 SHA256 72157afe6876d861763357fcd2845fee2ab94e7b280ea8d4b4e7dd7d92b189e4 SHA512 8d31c6fc3df702f03365352a4de3ee91efd5f4c2b002e9a29827a943f90fcbfefa67518df6e1ce1cb064ad1b44d575ae105013e30babdd723521a9950602a0dc WHIRLPOOL 7dc95dd5b42a6937e8eb260a440f157285f016dfa8bfa785f00da78521adef2a18ffa62ec3417c5a0681638d0ddd0d2b51794675b999ca14e2ddf818330f7f1c
 DIST tinyca2-0.7.5.tar.bz2 172779 SHA256 dc7d8180bf1db572fa4b08e15ecf8a47fc1c5bfdb55109bf2b3a54f86e5e60b7 SHA512 47df0b995715ad973b12da7d2999ae90f8887549437235b287e1d294331adc8d527bf4435ce1c30df278db8e5f8fc7df29a35d3650d41bfd4d0a0a7c193994aa WHIRLPOOL 5f990529ee503f07d8df0132c1b5834b8353d4908650535adb67ba82f04b1472559dca40ee972e4ce6ac22f31706774c981fc8fc905964df4b837ba6bec1a9be
 EBUILD tinyca-2.0.7.5-r1.ebuild 1611 SHA256 e4431fbb13432c3f2d432feb8998d42e220bc3d05653e529cd3526587be514e2 SHA512 4f589d2db2be666480b83a5acfb8012114c4eea0f034fbeff2d3988baebc87e059388e9c4a1f3212415c7f6dfc75f1dfc4f732928a22f63034a473136e002d53 WHIRLPOOL b405196ff5232481c4aa047abce8aa537d1c3fcbb6918c89842bef9ca03d879c0069b6aa327e99552216ca7380d066b0e46b5e22c3b488fd7e873f27903786e6
-MISC ChangeLog 1739 SHA256 f2dcb8875f49dd9613ddc1773c6359d9b6918d75512486526b27376dfe1a3204 SHA512 02e715c6bb82250abcd2d1579c092e4bef0c340ed5d45570d3a14be219bce2b9c4cf2259a86fccbb81ba13dfc2615ea6ad0de5815d9f9a3ba0f3a8d6c9454562 WHIRLPOOL eaef3034f490ac4c0bf5da202d6cc188d35ad0fd9a3afd408b6e01f3e0aeae7db1c4037eae2c1eb6e9d0e33101aa2fd51dbc19d66a5ac7cbecf31e3349baafb2
+EBUILD tinyca-2.0.7.5-r2.ebuild 1637 SHA256 e8db82c00ac8a4b257528bfa96f77ec1c2978a92bbf71a69e7884953a280c276 SHA512 cf9ac744aef70598e16fdba90d080daa64671bff373256563055889b9ce78c6bf1230ddda2699b572dbd87bdd4b89ad75d4e646823006d5a303a52ab7e17a8cb WHIRLPOOL 7372898c11f474ae7aeeb6bc40f8359c373c1e669f9c23cd379bc5ae54661c01df38b335bc62822b733d738ddd5d282b900a3fbf1d53df254bc3f493d8ccc614
+MISC ChangeLog 1955 SHA256 1776ef51a831f084ca4411d7e1715132f0e851e2daa2a234c7777537e090fa00 SHA512 a3b47e0a9a1cd62a72142b5eb3cac27a279c7613a0b2ca2c42738b82accb4ab7e5454df514a4973e9942b1782e36ff268f84622c4bb3f9958374a4f2a1ee8586 WHIRLPOOL eb8ca16a403e5b89bbfac275efdfb130f8500bbb3c008748d5f9a30b13b1057d69c55148260961326f590c2b0fdf5d0455cbd6ad990e508f91eb4f33eff00f9e
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlP0F8cACgkQXYk9GL8g3FFXpAEApVgLaevhGXHcoMM3MXLx+gO7
-NukTttWiKiByUtNSCrEA/37fqVFqgHnps6oAnHs3B8CdkHa+bSLJL7tYXVu/+sw8
-=n9/D
+iF4EAREIAAYFAlP0GNkACgkQXYk9GL8g3FEKXwEAns3O8iLxZr9r9ciz84OQCild
+wcrmt4PGKrZqj5RWc/IBAKMJJEy8gD/C8qvGedeCxvqwQDAShdGsOD186w9QT+5J
+=bf1n
 -----END PGP SIGNATURE-----
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
+}