[patch] Patch to make scribus-9999.ebuild merge.

update-docs-patch.patch (text/plain), 2.83 KB, created by James Cloos on 2012-05-20 04:21:20 UTC

diff -uNr a/app-office/scribus/Manifest b/app-office/scribus/Manifest
--- a/app-office/scribus/Manifest	2012-05-20 00:13:15.370623947 -0400
+++ b/app-office/scribus/Manifest	2012-05-20 00:15:16.417864263 -0400
@@ -1,4 +1,5 @@
 AUX scribus-1.4.0_rc5-docs.patch 828 RMD160 599634de0a6f7bc2594c28f2a1d089f3818f1fd5 SHA1 e9df8b185e0bf72c19c2e1586a6a8d1ceb9bb72a SHA256 50c56976bcc2e2a7d04ee62b8c2398d91137360f69e95910c6f2a01b49c8595f
+AUX scribus-1.5.0-docs.patch 751 RMD160 566535c6b0570b3dd1560c77c8a61cbaf5ce7117 SHA1 3a6a0817053850f845ab48cd6009c56d93da0e93 SHA256 7b34557bc506b9b2f6d2c8d968e619d080ed762586a9eb1c3480d7b2cbc23586
-EBUILD scribus-9999.ebuild 2951 RMD160 77bd6e3b2e46b0dce5033678e6e228f968f1b08a SHA1 c4ff832ca4cd0fa4a70e0e62fa0a9c9a53cf3487 SHA256 86971283dc370b8b35fff58c79fbddd8b60a4418fff40faea03014ac40300855
+EBUILD scribus-9999.ebuild 2947 RMD160 2a8e2915c0c6356eb7cf49f225a026115a64fa65 SHA1 00905f0e3e32ec397e4954a9a8f9964e087df3e6 SHA256 f94832bfe74f8652ee765356f35662beb13cd9f83489fd7bd6e326b340665f56
 MISC ChangeLog 20371 RMD160 1f7479fba53e45621b242c384bfe5a59f023cc86 SHA1 3569585135381fe1cc9e6906478d925db5556706 SHA256 c229ca603a63684e039505914f92a7ead6e180187324793575e4d79e9083777b
 MISC metadata.xml 1137 RMD160 00e3b693f409e0d90ee575f294c3caa1cbcc2b22 SHA1 8b7b7aef6154e329325efd40da2c22b7c099c513 SHA256 794d317abd9329bff636e333c582e7fd79a8f4cccfe8d606d960eb2aebb22ccc
diff -uNr a/app-office/scribus/files/scribus-1.5.0-docs.patch b/app-office/scribus/files/scribus-1.5.0-docs.patch
--- a/app-office/scribus/files/scribus-1.5.0-docs.patch	1969-12-31 19:00:00.000000000 -0500
+++ b/app-office/scribus/files/scribus-1.5.0-docs.patch	2012-05-19 23:11:13.777291580 -0400
@@ -0,0 +1,24 @@
+ CMakeLists.txt |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3f34048..4880594 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -267,7 +267,7 @@ ELSE (WIN32 OR OS2)
+     SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+   ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
+         IF(NOT WANT_VERSIONING)
+-            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/")
++            SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/")
+         ELSE(NOT WANT_VERSIONING)
+             SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/")
+         ENDIF(NOT WANT_VERSIONING)
+@@ -801,7 +801,6 @@ INSTALL(FILES
+   BUILDING
+   ChangeLog
+   ChangeLogSVN
+-  COPYING
+   LINKS
+   NEWS
+   PACKAGING
diff -uNr a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
--- a/app-office/scribus/scribus-9999.ebuild	2012-02-13 04:25:05.000000000 -0500
+++ b/app-office/scribus/scribus-9999.ebuild	2012-05-20 00:11:05.672663699 -0400
@@ -45,7 +45,7 @@
 	dev-libs/boost"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0_rc5-docs.patch
+	"${FILESDIR}"/${PN}-1.5.0-docs.patch
 	)
 
 pkg_setup() {