[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/

["Miroslav Šulc" <fordfrog@gentoo.org>]

commit:     aec91a89bd09d87037e3d64c9d924faa644d71ed
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 09:31:37 2016 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 09:32:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec91a89

app-office/scribus-9999: fixed patching the sources (ajdusted docdir patch and not using fpic patch as it is already applied)

Package-Manager: portage-2.3.3

 app-office/scribus/files/scribus-9999-docdir.patch | 31 ++++++++++++++++++++++
 app-office/scribus/scribus-9999.ebuild             |  3 +--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app-office/scribus/files/scribus-9999-docdir.patch b/app-office/scribus/files/scribus-9999-docdir.patch
new file mode 100644
index 00000000..442829d
--- /dev/null
+++ b/app-office/scribus/files/scribus-9999-docdir.patch
@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 79b1feb..259d474 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -284,16 +284,18 @@ 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}/")
++if(NOT DOCDIR)
++	if(WIN32 OR OS2)
++		set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
+ 	else()
+-		if(NOT WANT_VERSIONING)
+-			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
++		if(TAG_VERSION OR BUILD_OSX_BUNDLE)
++			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+ 		else()
+-			set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
++			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()

diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index e96e3f6..ec8570c 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -74,8 +74,7 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-docdir.patch
-	"${FILESDIR}"/${PN}-1.5.2-fpic.patch
+	"${FILESDIR}"/${P}-docdir.patch
 	)
 
 src_prepare() {