From e9d044d4b9b71200a96adfa280848858c0f468c9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 13 Nov 2021 13:10:00 +0000
Subject: gentoo resync : 13.11.2021

---
 app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch   | 11 -----------
 app-i18n/zinnia/files/zinnia-0.06-c++11.patch      | 11 +++++++++++
 app-i18n/zinnia/files/zinnia-0.06-flags.patch      |  4 ++--
 app-i18n/zinnia/files/zinnia-0.06-perl.patch       | 11 +++++++++++
 app-i18n/zinnia/files/zinnia-0.06-perl_build.patch | 11 -----------
 5 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch
 create mode 100644 app-i18n/zinnia/files/zinnia-0.06-c++11.patch
 create mode 100644 app-i18n/zinnia/files/zinnia-0.06-perl.patch
 delete mode 100644 app-i18n/zinnia/files/zinnia-0.06-perl_build.patch

(limited to 'app-i18n/zinnia/files')

diff --git a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch b/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch
deleted file mode 100644
index 0ef6ae40e434..000000000000
--- a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /trainer.cpp
-+++ /trainer.cpp
-@@ -103,7 +103,7 @@
-     if (!fn) {
-       return false;
-     }
--    x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn));
-+    x_.push_back(std::make_pair(y, fn));
-     return true;
-   }
- 
diff --git a/app-i18n/zinnia/files/zinnia-0.06-c++11.patch b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch
new file mode 100644
index 000000000000..66a78a5a6997
--- /dev/null
+++ b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch
@@ -0,0 +1,11 @@
+--- a/trainer.cpp
++++ b/trainer.cpp
+@@ -103,7 +103,7 @@
+     if (!fn) {
+       return false;
+     }
+-    x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn));
++    x_.push_back(std::make_pair(y, fn));
+     return true;
+   }
+ 
diff --git a/app-i18n/zinnia/files/zinnia-0.06-flags.patch b/app-i18n/zinnia/files/zinnia-0.06-flags.patch
index 80442ee4880f..5c26415f6018 100644
--- a/app-i18n/zinnia/files/zinnia-0.06-flags.patch
+++ b/app-i18n/zinnia/files/zinnia-0.06-flags.patch
@@ -1,5 +1,5 @@
---- /configure.in
-+++ /configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -59,15 +59,6 @@
  AC_SUBST([pkgconfigdir])
  AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}])
diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl.patch b/app-i18n/zinnia/files/zinnia-0.06-perl.patch
new file mode 100644
index 000000000000..02d52faf93a7
--- /dev/null
+++ b/app-i18n/zinnia/files/zinnia-0.06-perl.patch
@@ -0,0 +1,11 @@
+--- a/perl/Makefile.PL
++++ b/perl/Makefile.PL
+@@ -4,7 +4,7 @@
+     'CC'                => 'c++',
+     'LD'                => 'c++',
+     'INC'               => '',
+-    'LIBS'              => '-lzinnia',
++    'LIBS'              => '-L../.libs -lzinnia',
+ #    'VERSION'	        => '0.1',
+     'OBJECT'            => 'zinnia_wrap.o' 
+ );
diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch b/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch
deleted file mode 100644
index 4da9e1eeb900..000000000000
--- a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /perl/Makefile.PL
-+++ /perl/Makefile.PL
-@@ -4,7 +4,7 @@
-     'CC'                => 'c++',
-     'LD'                => 'c++',
-     'INC'               => '',
--    'LIBS'              => '-lzinnia',
-+    'LIBS'              => '-L../.libs -lzinnia',
- #    'VERSION'	        => '0.1',
-     'OBJECT'            => 'zinnia_wrap.o' 
- );
-- 
cgit v1.2.3