summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-office/scribus/ChangeLog6
-rw-r--r--app-office/scribus/Manifest10
-rw-r--r--app-office/scribus/scribus-1.4.0.ebuild10
3 files changed, 18 insertions, 8 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog
index de757a0f1df4..aecfa44061c4 100644
--- a/app-office/scribus/ChangeLog
+++ b/app-office/scribus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/scribus
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.149 2012/01/04 09:11:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.150 2012/01/22 13:01:35 jlec Exp $
+
+ 22 Jan 2012; Justin Lecher <jlec@gentoo.org> scribus-1.4.0.ebuild:
+ Don't compress the help file symlink with temporary workaround from #399595,
+ #397801
*scribus-1.4.0 (04 Jan 2012)
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index c96b00bfe948..6b9880e8dabb 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -8,13 +8,13 @@ DIST scribus-1.3.9.tar.bz2 35729860 RMD160 63e1d3f7f723843e9d1c787e1405b57a15f08
DIST scribus-1.4.0.tar.bz2 42134397 RMD160 f4a0813c1961f1929bccaaa4c0a21f84dfd75c62 SHA1 d19e455f261c4075076f1d6f4a55fbd934a66c60 SHA256 9ae4e50523f0891c9dce45893ca9f58d32096442e43e75acec466fd9405362a9
EBUILD scribus-1.3.9-r2.ebuild 2116 RMD160 c6c4c443911ea6d6052e0f094685e0e83d0a4324 SHA1 48327cd45dfc02a60b989b920bccf6770ee823d5 SHA256 85b650842af55f1ebd063d898fb3b32e4a4c7d3c3bbfa6e2382f024b485143fb
EBUILD scribus-1.3.9.ebuild 1760 RMD160 98f5cdabc0a96a5e2851f310491062d69fad782a SHA1 ddf0cad864308587b1e0e6c4c1711e8dcb2428be SHA256 fca86c8dec51f2cf185702bb0db6aa3ceaa483895d1ac2c200005c33f2492849
-EBUILD scribus-1.4.0.ebuild 2672 RMD160 c42866ab92979b929396cd46a3051517a4e3615d SHA1 8c0a44d59ee48128ae7ba2fbaed6fb356b5ce63d SHA256 190f827defa255072a997eceea625366bd5655f3abe8fbaca80367a0796b0b3b
-MISC ChangeLog 19024 RMD160 bf1a7c92d2bd0968c3622d50bc11244ac38d7566 SHA1 0ccfc74c8ba4ea6667e8692be94ab09d3c036838 SHA256 aa8e5624e191d3a8757c2cf32ac9caf3038ba1b4eab7bae0e141de18c804ad0a
+EBUILD scribus-1.4.0.ebuild 2831 RMD160 ab9ce9c91a52ea1ed8c854888f497516f1b63595 SHA1 3565f462f22e83d6908cecd850d7b68e3bf6959a SHA256 278557c7438a0f5d1b0e261640a23fb6e1463f80ab97edd2c4b829d8b38acf6b
+MISC ChangeLog 19183 RMD160 8ff4483e4b1dcffef784dc8699fc84fea09b4151 SHA1 a4788b99c8df6f3186e8f0cbe5ae59c22bdcf27f SHA256 fddffa4250258e021ac15dd4e916e4ce268d135eb01d6b1290306eddf1196d5d
MISC metadata.xml 1137 RMD160 00e3b693f409e0d90ee575f294c3caa1cbcc2b22 SHA1 8b7b7aef6154e329325efd40da2c22b7c099c513 SHA256 794d317abd9329bff636e333c582e7fd79a8f4cccfe8d606d960eb2aebb22ccc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEAREKAAYFAk8EF7EACgkQgAnW8HDreRYH4QCgs/kfpd4iRTNhJqkApDQaIZn+
-ph4AoL8UDZP0cB85OXMnQYtFNf0659+T
-=4uh2
+iEYEAREKAAYFAk8cCMMACgkQgAnW8HDreRbBUACglKxhCNyNFaKbiTOHNp0BkUho
+bhUAn2DiPXuX+mwafkztTNpaSaUnxVm8
+=6lh+
-----END PGP SIGNATURE-----
diff --git a/app-office/scribus/scribus-1.4.0.ebuild b/app-office/scribus/scribus-1.4.0.ebuild
index f3381d2a1a9e..0c1e651e1f90 100644
--- a/app-office/scribus/scribus-1.4.0.ebuild
+++ b/app-office/scribus/scribus-1.4.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0.ebuild,v 1.1 2012/01/04 09:11:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-1.4.0.ebuild,v 1.2 2012/01/22 13:01:35 jlec Exp $
EAPI=4
@@ -94,11 +94,17 @@ src_install() {
mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
-
+ docompress -x /usr/share/doc/${PF}/en
doicon resources/icons/scribus.png
domenu scribus.desktop
}
+pkg_preinst() {
+ # 399595
+ rm -vf "${ED}"/usr/share/doc/${PF}/en* || die
+ ln -sf html "${ED}"/usr/share/doc/${PF}/en
+}
+
pkg_postinst() {
fdo-mime_mime_database_update
}