dev-lang/logtalk: clean duplicate patches

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7899
This commit is contained in:
Marty E. Plummer
2018-04-20 21:43:25 +02:00
committed by David Seifert
parent fd7d57ec83
commit bde0099af8
7 changed files with 12 additions and 47 deletions
@@ -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..."
@@ -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..."
@@ -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
@@ -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
+2 -2
View File
@@ -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() {
+2 -2
View File
@@ -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() {
+2 -2
View File
@@ -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() {