commit: eb6e4b54f11a87fe5ab5a5bbbc64f6720d9d09e2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 10 15:06:33 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 10 15:54:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6e4b54
app-office/scribus: QA: Remove duplicate patches
Package-Manager: Portage-2.3.36, Repoman-2.3.9
app-office/scribus/files/scribus-9999-docdir.patch | 42 ----------------------
app-office/scribus/files/scribus-9999-fpic.patch | 16 ---------
app-office/scribus/scribus-9999.ebuild | 4 +--
3 files changed, 2 insertions(+), 60 deletions(-)
diff --git a/app-office/scribus/files/scribus-9999-docdir.patch
b/app-office/scribus/files/scribus-9999-docdir.patch
deleted file mode 100644
index d866922fa18..00000000000
--- a/app-office/scribus/files/scribus-9999-docdir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- CMakeLists.txt | 28 +++++++++++++++-------------
- 1 file changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 29d66f3..1c08cdd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -244,19 +244,21 @@ else()
- endif()
-
- #SHARE - use the default on Apple as TAG_VERSION is empty
--if(WIN32 OR OS2)
-- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
--else()
-- if(TAG_VERSION OR BUILD_OSX_BUNDLE)
-- set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-- else()
-- if(NOT WANT_VERSIONING)
-- set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
-- else()
-- set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
-- endif()
-- endif()
--endif()
-+if(NOT DOCDIR)
-+ if(WIN32 OR OS2)
-+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
-+ else()
-+ if(TAG_VERSION OR BUILD_OSX_BUNDLE)
-+ set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
-+ else()
-+ if(NOT WANT_VERSIONING)
-+ set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
-+ else()
-+ set(DOCDIR
"${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
-+ endif()
-+ endif()
-+ endif()
-+endif()
- if(NOT IS_ABSOLUTE ${DOCDIR})
- add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
- else()
diff --git a/app-office/scribus/files/scribus-9999-fpic.patch
b/app-office/scribus/files/scribus-9999-fpic.patch
deleted file mode 100644
index ba0721955ef..00000000000
--- a/app-office/scribus/files/scribus-9999-fpic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- scribus/third_party/prc/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/scribus/third_party/prc/CMakeLists.txt
b/scribus/third_party/prc/CMakeLists.txt
-index 5f7c2c6..1da7177 100644
---- a/scribus/third_party/prc/CMakeLists.txt
-+++ b/scribus/third_party/prc/CMakeLists.txt
-@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
- ${FREETYPE_INCLUDE_DIRS}
- )
-
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-+
- set(SCRIBUS_PRC_LIB_SOURCES
- oPRCFile.cc
- PRCbitStream.cc
diff --git a/app-office/scribus/scribus-9999.ebuild
b/app-office/scribus/scribus-9999.ebuild
index e0fb1c4035f..742448b2738 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -94,8 +94,8 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${P}-docdir.patch
- "${FILESDIR}"/${P}-fpic.patch
+ "${FILESDIR}"/${PN}-1.5.3-docdir.patch
+ "${FILESDIR}"/${PN}-1.5.3-fpic.patch
)
src_prepare() {
