[gentoo-commits] repo/gentoo:master commit in: www-apps/liquid_feedback_core/, www-apps/liquid_feedback_core/files/

[gentoo-commits] repo/gentoo:master commit in: www-apps/liquid_feedback_core/, www-apps/liquid_feedback_core/files/

[Alfredo Tupone]

commit:     50864d4144c96089e2324d2f987cc196b7fdb9c9
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Sun Apr  8 21:44:27 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 08:28:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50864d41

www-apps/liquid_feedback_core: clean duplicate patches

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../files/liquid_feedback_core-2.2.3-gentoo.patch  |  4 ++--
 .../files/liquid_feedback_core-2.2.6-gentoo.patch  | 24 ----------------------
 .../files/liquid_feedback_core-3.0.4-gentoo.patch  |  4 ++--
 .../liquid_feedback_core-2.2.3.ebuild              |  4 ++--
 .../liquid_feedback_core-2.2.6.ebuild              |  4 ++--
 .../liquid_feedback_core-3.0.4.ebuild              |  4 ++--
 6 files changed, 10 insertions(+), 34 deletions(-)

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 f4d55512174..bd5874583e3 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 f4d55512174..00000000000
--- 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 fbc91eff246..44062adee91 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 a40a1a7ca93..e3b9b16d3f0 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 6310c163ce0..a914251c479 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 a40a1a7ca93..982f8b95469 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() {