gentoo resync : 16.04.2018

7 files changed, 15 insertions, 40 deletions

diff --git a/www-apps/liquid_feedback_core/Manifest b/www-apps/liquid_feedback_core/Manifest
index bc10ffa721af..7d55b5d965c4 100644
--- a/www-apps/liquid_feedback_core/Manifest
+++ b/www-apps/liquid_feedback_core/Manifest
@@ -1,11 +1,10 @@
-AUX liquid_feedback_core-2.2.3-gentoo.patch 681 BLAKE2B 86ba5cc6df124c49e6d7d1d9ac6728e808ca33c554105b2b8cc5c4e75ada0395a9a800c9f08bd0987e21785da1cdd0bafc0523ca58867d526208c41711ddc642 SHA512 2d4d8adbb624e7e9bdc531b69e94931e1e65309ba88e53c5cc09ffe9adb68d87b2288cb850512bc4527f24915a34b89658d96928791f8d94d409342edcc3a657
-AUX liquid_feedback_core-2.2.6-gentoo.patch 681 BLAKE2B 86ba5cc6df124c49e6d7d1d9ac6728e808ca33c554105b2b8cc5c4e75ada0395a9a800c9f08bd0987e21785da1cdd0bafc0523ca58867d526208c41711ddc642 SHA512 2d4d8adbb624e7e9bdc531b69e94931e1e65309ba88e53c5cc09ffe9adb68d87b2288cb850512bc4527f24915a34b89658d96928791f8d94d409342edcc3a657
-AUX liquid_feedback_core-3.0.4-gentoo.patch 915 BLAKE2B c3ddf8041d04a8d30cf6b24d76dd14789b75f720c7972530ccb194fc2fca4dbd2ee7a41fe2fdae2a05db8bf9247a776ffaa8948b8295dd0c2baae94faefc450e SHA512 126ff6b3451e8877d2bd7e77c8408c445c4ad9db2a36f5774ceec8f8dd5efad081c0ecae6ec5304654e1488a3e8e40f29a9008c852cec2dd77ead650b53382ae
+AUX liquid_feedback_core-2.2.3-gentoo.patch 609 BLAKE2B 2e142166f14f755720ed27213c4bbe8c30070dc36f6640c32ce9505614eb438140f7c7ea9c9fc0089ba62a100f5ef634adce107e2218dcb2d14b5584c52aceec SHA512 59058bd2ec5c60c13864b0d928b536ef3222be23eba49427b1c7c76c6e84a0130d802102eb3c14a48c5d60d1b93e8859feec339368e479bae1c08acbaeb2f63d
+AUX liquid_feedback_core-3.0.4-gentoo.patch 843 BLAKE2B 81b37cf79c20a83db0d5c55df82db93674177b9821781c60605113877ac7c2a5659f38c4466731ccdf3dbce8507ecf2bc2ea758b21dbd08f91b38af7bd1b4aec SHA512 7eb4f00c375f102910d755c3a2896fa4d3f1213c430e6cb1154a7d135f8445580245f93055a1d6f84fa1826f74c226d3bac9ebfd37d5be4c45ec9fd34e05b859
 AUX postinstall-en.txt 1498 BLAKE2B 0b29f386ea2c6a132046a42ebb246ecb428821d76a027722b4260f7c7bd00e99186ce145a2b5d7f169eb25b28a702ef4d3c2e0a0ae3217321f6969a2efc02304 SHA512 cd1488337b3faae08a1d7c326b4c1445863fb07b3d39b63460703467ad85524acf0fc14a19278a9cf995304e3a79c1b90ecdc0098f984d106d484f79d315b8e2
 DIST liquid_feedback_core-v2.2.3.tar.gz 124770 BLAKE2B ea020095572b2fe9f8c48206c192360f590f20be7cc213ec7dac509416e0b8419b32cc91a0a527a0e39d3f373fcc11250e666dfcd73534fde1320f5da58306a4 SHA512 a87af2b4ba218289b679a1ffb5751d29eed0d368233e431123c8ce98c1eab5bf62f516e4beb3177ecb302c9062c86b6f908cff3155783dcfcb2d279804079a87
 DIST liquid_feedback_core-v2.2.6.tar.gz 127440 BLAKE2B d62ecd8c9947259a7213f92ecaf1491a5e858ff2fdaff5e020fc4ec0c433297d8a7701a812de200130a1ed7f08ded1d9f31d42de7fffa2981361efee0e31646c SHA512 6f680398a7d2e529e642dc94ba16bc1b33d25459ddbf629c06387391ef13c0e212a108cc337cd2bc29505f4f6436b6e92994e63eaa09fe1c07733d2821d9b7f1
 DIST liquid_feedback_core-v3.0.4.tar.gz 142983 BLAKE2B 05e8c1630a8fa3932b4fc291843dd0c45e2333940394a0632309c9041dc850cc894a6cb54fb840329f67812ebcde5d540c338cf27a88ad428aaa066329725409 SHA512 baea8a61c94e640557d0169b6171247ff0303ff1a9c8b587c6769e367cf56805c1a1e660aadf7178d984182be6dde326770240b3ffeda42139c4a94445a2bbf8
-EBUILD liquid_feedback_core-2.2.3.ebuild 962 BLAKE2B 36ae0f5c654f095aa4d573b76871a02c5573dc453ae9dde98a4943fdf9b627769578fb4cc46747d12b4bad452a5cf7557ce97ad88cf37378eb05dcb4065984bc SHA512 13fa9ad204ae30a5c669c770332fcf7a9924616f2ce7c90c14a6508c2a18d8040c5f8e8f568707c341a2564f5bd6c78324cafd3e132a44a0a01a26360bba79d6
-EBUILD liquid_feedback_core-2.2.6.ebuild 1099 BLAKE2B cc6eb14880fc32acc2ba2d63dcbf937a85036d8604bf9a654ab7d7080bb3d2b60f7e37669335050597c2ca84aa4b1938a04e4bc6c1b5b89e5e06a6d8ea6fed11 SHA512 a6a9fc6b59b81853c783b74b813c301b2cce4e1a60edda5872593801d0f869c0537fcadb8dabf1e7f2a50f386ddc8ebc68eceeff47780ca1ddd50c8bc8a3d972
-EBUILD liquid_feedback_core-3.0.4.ebuild 962 BLAKE2B 36ae0f5c654f095aa4d573b76871a02c5573dc453ae9dde98a4943fdf9b627769578fb4cc46747d12b4bad452a5cf7557ce97ad88cf37378eb05dcb4065984bc SHA512 13fa9ad204ae30a5c669c770332fcf7a9924616f2ce7c90c14a6508c2a18d8040c5f8e8f568707c341a2564f5bd6c78324cafd3e132a44a0a01a26360bba79d6
+EBUILD liquid_feedback_core-2.2.3.ebuild 969 BLAKE2B 7528a6059a7e1eb1d6e340028c9195a77db8e3de471e99333b8d8232093c5c7be05e81b397ea9baadbea96de59269a5ade470a06c333f9e7f2f24adf9322b58f SHA512 681fb30dabad60453bac888f01557a50d5cf65693eb453f42f7e495a1c3a1c1259a28804f3431c0d323e451aa6caf40e0c2c1685e732b0c131637da499fddbe7
+EBUILD liquid_feedback_core-2.2.6.ebuild 1106 BLAKE2B df24ce5b1a7644b187323950268cd6148f5d2d73887d045e6985c484996a21c56b85f2032b832806d8b8a74cfedef821ed52aa14457605daf75a926be6e123d7 SHA512 d2ee14faf7f435f7d83954e9ce0bdb2fa861ea417927d117d948c77c06c13cdfe0623471367b384d91983418b8d32be1e3032f7e449fc336b8c5ac5b754f4e87
+EBUILD liquid_feedback_core-3.0.4.ebuild 969 BLAKE2B 9202588851c23b109db9805c299ceb7fece980311acf980ab7f7374ad7d787928a47cac119c8faed3ca11fc9a27bcbc973bc7eef25ceff6b5a75927507fd529a SHA512 9b667019dbc756a8baaf082b147a008f3216073e5fe0b3b863a74cc3e52fe67b4a1d90672df42f8ea6d2bed75fd32ee6a9f07c9818dcf18a43c934dc4f5c6e9a
 MISC metadata.xml 1099 BLAKE2B c846e77c5b1531e4ea502b308146062803cd79f74b275cf131343fe5c9c6b0f86a107c84f40cf3be95910ed5b99174d0c9883836a06b535b2d4f08514c9b082e SHA512 1fbc5d0f4eff2085665038a48155b652d434ec42019a5343fe1c1ef34a7b863aa2f21636145d105cf9052ef0756400f29098f3017f948d3aa0fb854f89cd6ff0
diff --git a/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.3-gentoo.patch b/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.3-gentoo.patch
index f4d555121745..bd5874583e3a 100644
--- a/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.3-gentoo.patch
+++ b/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.3-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2013-03-22 15:26:23.340764442 +0100
-+++ Makefile	2013-03-22 15:36:50.838733773 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -1,16 +1,10 @@
  all:: lf_update lf_update_suggestion_order
  
diff --git a/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.6-gentoo.patch b/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.6-gentoo.patch
deleted file mode 100644
index f4d555121745..000000000000
--- a/www-apps/liquid_feedback_core/files/liquid_feedback_core-2.2.6-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.old	2013-03-22 15:26:23.340764442 +0100
-+++ Makefile	2013-03-22 15:36:50.838733773 +0100
-@@ -1,16 +1,10 @@
- all:: lf_update lf_update_suggestion_order
- 
--lf_update: lf_update.c
--	cc	-Wall -O2 \
--		-I "`pg_config --includedir`" \
--		-L "`pg_config --libdir`" \
--		-o lf_update lf_update.c -lpq
--
--lf_update_suggestion_order: lf_update_suggestion_order.c
--	cc	-Wall -O2 \
--		-I "`pg_config --includedir`" \
--		-L "`pg_config --libdir`" \
--		-o lf_update_suggestion_order lf_update_suggestion_order.c -lpq
-+CPPFLAGS=-I `pg_config --includedir`
-+LDFLAGS=-L `pg_config --libdir`
-+CFLAGS=-Wall -O2
-+CC=cc
-+LDLIBS=-lpq
- 
- clean::
- 	rm -f lf_update lf_update_suggestion_order
diff --git a/www-apps/liquid_feedback_core/files/liquid_feedback_core-3.0.4-gentoo.patch b/www-apps/liquid_feedback_core/files/liquid_feedback_core-3.0.4-gentoo.patch
index fbc91eff2467..44062adee918 100644
--- a/www-apps/liquid_feedback_core/files/liquid_feedback_core-3.0.4-gentoo.patch
+++ b/www-apps/liquid_feedback_core/files/liquid_feedback_core-3.0.4-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2014-11-29 22:38:43.200509267 +0100
-+++ Makefile	2014-11-29 22:39:16.392199651 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -1,22 +1,10 @@
  all:: lf_update lf_update_issue_order lf_update_suggestion_order
  
diff --git a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.3.ebuild b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.3.ebuild
index a40a1a7ca93a..e3b9b16d3f0a 100644
--- a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.3.ebuild
+++ b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-2.2.3-gentoo.patch
 }
 
 src_compile() {
diff --git a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild
index 6310c163ce09..a914251c479c 100644
--- a/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild
+++ b/www-apps/liquid_feedback_core/liquid_feedback_core-2.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-2.2.3-gentoo.patch
 }
 
 src_compile() {
diff --git a/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild b/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
index a40a1a7ca93a..982f8b95469d 100644
--- a/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
+++ b/www-apps/liquid_feedback_core/liquid_feedback_core-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.0.4-gentoo.patch
 }
 
 src_compile() {