dev-lang/logtalk: clean duplicate patches

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7899

7 files changed, 12 insertions, 47 deletions

diff --git a/dev-lang/logtalk/files/logtalk-3.00.0-no-user-docs.patch b/dev-lang/logtalk/files/logtalk-3.00.0-no-user-docs.patch
index d25f19347d66..7c14f28413a6 100644
--- a/dev-lang/logtalk/files/logtalk-3.00.0-no-user-docs.patch
+++ b/dev-lang/logtalk/files/logtalk-3.00.0-no-user-docs.patch
@@ -1,5 +1,5 @@
---- logtalk-3.00.0.orig/scripts/logtalk_user_setup.sh	2015-01-08 14:04:03.000000000 +0100
-+++ logtalk-3.00.0/scripts/logtalk_user_setup.sh	2015-01-08 14:05:05.000000000 +0100
+--- a/scripts/logtalk_user_setup.sh
++++ b/scripts/logtalk_user_setup.sh
 @@ -114,14 +114,12 @@
  
  echo "Copying Logtalk files and directories..."
diff --git a/dev-lang/logtalk/files/logtalk-3.03.0-no-user-docs.patch b/dev-lang/logtalk/files/logtalk-3.03.0-no-user-docs.patch
index b28fd4852b04..6d4e7ab9154b 100644
--- a/dev-lang/logtalk/files/logtalk-3.03.0-no-user-docs.patch
+++ b/dev-lang/logtalk/files/logtalk-3.03.0-no-user-docs.patch
@@ -1,5 +1,5 @@
---- logtalk-3.03.0.orig/scripts/logtalk_user_setup.sh	2016-02-16 22:09:02.000000000 +0100
-+++ logtalk-3.03.0/scripts/logtalk_user_setup.sh	2016-02-20 09:49:34.000000000 +0100
+--- a/scripts/logtalk_user_setup.sh
++++ b/scripts/logtalk_user_setup.sh
 @@ -110,14 +110,12 @@
  
  echo "Copying Logtalk files and directories..."
diff --git a/dev-lang/logtalk/files/logtalk-3.07.0-no-user-docs.patch b/dev-lang/logtalk/files/logtalk-3.07.0-no-user-docs.patch
deleted file mode 100644
index b28fd4852b04..000000000000
--- a/dev-lang/logtalk/files/logtalk-3.07.0-no-user-docs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- logtalk-3.03.0.orig/scripts/logtalk_user_setup.sh	2016-02-16 22:09:02.000000000 +0100
-+++ logtalk-3.03.0/scripts/logtalk_user_setup.sh	2016-02-20 09:49:34.000000000 +0100
-@@ -110,14 +110,12 @@
- 
- echo "Copying Logtalk files and directories..."
- mkdir -p "$LOGTALKUSER"/contributions
--mkdir -p "$LOGTALKUSER"/docs
- mkdir -p "$LOGTALKUSER"/examples
- mkdir -p "$LOGTALKUSER"/library
- mkdir -p "$LOGTALKUSER"/scratch
- mkdir -p "$LOGTALKUSER"/tests
- mkdir -p "$LOGTALKUSER"/tools
- cp -RL "$LOGTALKHOME"/contributions "$LOGTALKUSER"/
--cp -RL "$LOGTALKHOME"/docs "$LOGTALKUSER"/
- cp -RL "$LOGTALKHOME"/examples "$LOGTALKUSER"/
- cp -RL "$LOGTALKHOME"/library "$LOGTALKUSER"/
- cp -RL "$LOGTALKHOME"/scratch "$LOGTALKUSER"/
-@@ -131,16 +129,7 @@
- rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/lgt2*
- rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/logtalk.dtd
- rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/logtalk.xsd
--ln -sf "$LOGTALKHOME"/BIBLIOGRAPHY.bib "$LOGTALKUSER"/BIBLIOGRAPHY.bib
--ln -sf "$LOGTALKHOME"/CUSTOMIZE.md "$LOGTALKUSER"/CUSTOMIZE.md
--ln -sf "$LOGTALKHOME"/INSTALL.md "$LOGTALKUSER"/INSTALL.md
--ln -sf "$LOGTALKHOME"/LICENSE.txt "$LOGTALKUSER"/LICENSE.txt
--ln -sf "$LOGTALKHOME"/QUICK_START.md "$LOGTALKUSER"/QUICK_START.md
--ln -sf "$LOGTALKHOME"/README.md "$LOGTALKUSER"/README.md
--ln -sf "$LOGTALKHOME"/RELEASE_NOTES.md "$LOGTALKUSER"/RELEASE_NOTES.md
--ln -sf "$LOGTALKHOME"/UPGRADING.md "$LOGTALKUSER"/UPGRADING.md
- ln -sf "$LOGTALKHOME"/adapters "$LOGTALKUSER"/adapters
--ln -sf "$LOGTALKHOME"/manuals "$LOGTALKUSER"/manuals
- ln -sf "$LOGTALKHOME"/paths "$LOGTALKUSER"/paths
- ln -sf "$LOGTALKHOME"/coding "$LOGTALKUSER"/coding
- ln -sf "$LOGTALKHOME"/tools/lgtdoc/xml/lgt2html.sh "$LOGTALKUSER"/tools/lgtdoc/xml/lgt2html
diff --git a/dev-lang/logtalk/files/logtalk-3.11.2-portage.patch b/dev-lang/logtalk/files/logtalk-3.11.2-portage.patch
index bbe75385a92e..f416217399f1 100644
--- a/dev-lang/logtalk/files/logtalk-3.11.2-portage.patch
+++ b/dev-lang/logtalk/files/logtalk-3.11.2-portage.patch
@@ -1,6 +1,5 @@
-diff -urN logtalk-3.11.2.orig/scripts/logtalk_user_setup.sh logtalk-3.11.2/scripts/logtalk_user_setup.sh
---- logtalk-3.11.2.orig/scripts/logtalk_user_setup.sh	2017-08-28 10:13:52.000000000 +0200
-+++ logtalk-3.11.2/scripts/logtalk_user_setup.sh	2017-09-24 14:47:36.815968990 +0200
+--- a/scripts/logtalk_user_setup.sh
++++ b/scripts/logtalk_user_setup.sh
 @@ -130,14 +130,6 @@
  rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/lgt2*
  rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/logtalk.dtd
diff --git a/dev-lang/logtalk/logtalk-3.00.0.ebuild b/dev-lang/logtalk/logtalk-3.00.0.ebuild
index 18801007a6b0..e8110105911d 100644
--- a/dev-lang/logtalk/logtalk-3.00.0.ebuild
+++ b/dev-lang/logtalk/logtalk-3.00.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ RDEPEND="
 	${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-user-docs.patch
+	epatch "${FILESDIR}"/${PN}-3.00.0-no-user-docs.patch
 }
 
 src_install() {
diff --git a/dev-lang/logtalk/logtalk-3.03.0.ebuild b/dev-lang/logtalk/logtalk-3.03.0.ebuild
index dae592f640b3..b4dc94c188c9 100644
--- a/dev-lang/logtalk/logtalk-3.03.0.ebuild
+++ b/dev-lang/logtalk/logtalk-3.03.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ RDEPEND="
 	${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-user-docs.patch
+	epatch "${FILESDIR}"/${PN}-3.03.0-no-user-docs.patch
 }
 
 src_install() {
diff --git a/dev-lang/logtalk/logtalk-3.07.0.ebuild b/dev-lang/logtalk/logtalk-3.07.0.ebuild
index cb0cc659b75b..e21a6aae0692 100644
--- a/dev-lang/logtalk/logtalk-3.07.0.ebuild
+++ b/dev-lang/logtalk/logtalk-3.07.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,7 +21,7 @@ RDEPEND="
 	${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-user-docs.patch
+	epatch "${FILESDIR}"/${PN}-3.03.0-no-user-docs.patch
 }
 
 src_install() {