diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-06-15 19:30:10 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-06-15 19:30:10 +0000 |
| commit | 311dbb503273af4aebfe8a15b0d9b5540e922759 (patch) | |
| tree | b4a8af28d364d5d8bfb4dfdcf29cb3346467ad67 | |
| parent | Version bumps. Ebuilds by Arfrever. (diff) | |
| download | historical-311dbb503273af4aebfe8a15b0d9b5540e922759.tar.gz historical-311dbb503273af4aebfe8a15b0d9b5540e922759.tar.bz2 historical-311dbb503273af4aebfe8a15b0d9b5540e922759.zip | |
Adopt to current HEAD, bug #551816; use ninja as build engine
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!
| -rw-r--r-- | app-office/scribus/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/scribus/Manifest | 32 | ||||
| -rw-r--r-- | app-office/scribus/scribus-9999.ebuild | 28 |
3 files changed, 34 insertions, 31 deletions
diff --git a/app-office/scribus/ChangeLog b/app-office/scribus/ChangeLog index d54984066380..18e60740df3a 100644 --- a/app-office/scribus/ChangeLog +++ b/app-office/scribus/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/scribus # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.212 2015/06/08 06:46:33 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/ChangeLog,v 1.213 2015/06/15 19:30:04 jlec Exp $ + + 15 Jun 2015; Justin Lecher <jlec@gentoo.org> scribus-9999.ebuild: + Adopt to current HEAD, bug #551816; use ninja as build engine 08 Jun 2015; Justin Lecher <jlec@gentoo.org> files/scribus-1.5.0-fpic.patch: Handle fPIC for hppa, bug #551452 diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 1fea36398c74..c001cd436bec 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -16,25 +16,25 @@ EBUILD scribus-1.4.5-r1.ebuild 5197 SHA256 2dc18a0749e691701ad67aa98589ebcc23754 EBUILD scribus-1.4.5.ebuild 4120 SHA256 075b656f0f695f4951f72cd7e69d8adb3996686e73843b47703f10ec129a2b27 SHA512 fcd26ef6ea67a956a805cec435c6938cf190f7ed1e2b7d8ac364c6fea9cda5bcfbe7b84dddda32bbe99ad9c8a845826cd6d5eba90390e4cc954e70c4ef010f31 WHIRLPOOL 2522e5f34b6c56e35eda523821c5716bb3e937b75dac55baac01095059d40266b8be6a07a59962b348e036770e97231762081886fe60c53a802c8ca9303f13b2 EBUILD scribus-1.5.0-r1.ebuild 5902 SHA256 6bdc67a22544cf199c1267ea105154951400d43a5ce4a9377481c8b4eabf83fb SHA512 917f64bc3dae90e404b403c821ef52a7b3e8bb7900f3741b8322f42748dced37c2a7a34921c2abc47c392249efc883a511d775220c9ad38a82a65ffb0a07fb93 WHIRLPOOL 6db75acdb993d992272ab6392ca15600aef04b4e3fe2f7cf0a38d93234a66a5a576d1fe9993aa19ab74888b70fdbbe6ed3e608d6dd8f20468545b24e60604771 EBUILD scribus-1.5.0.ebuild 5828 SHA256 aba34ce3f7392c8a60e526c5d6c6974a2a5b5667ac350f44741d2bed11912303 SHA512 f2858ee5186fc8489bf6518c7451351b155b8edad3cc5d98929608b20097b71621651f809fb775d5ff71b3ef459ef17bd2b5b4d272f21b07103d56a5b5876555 WHIRLPOOL 5cdad215bff48b5d551056879834d9bda7656fa10db15ae0eb20cfcba03fd6894707fd6c129bc5564e05623b3ae9280de947b1ec6580caf4ff722453ecc63920 -EBUILD scribus-9999.ebuild 5882 SHA256 8ed20081d674a646d586b8b179193e2a0129389f6cbd304ab683742657031c52 SHA512 05dc3357309c9e137de78f16bc9e5cd1820baef76ceaada06042736d2654cda915e2f3f5094612ad40d9cb44950d14437eea1ce4d803f0db8c0f7e3140b024e5 WHIRLPOOL becd04fb6a976d455eca7d1f93d2d9501f78caaef7b873824678928d25491d08ba7641f331f3382b0a989051a1c3547ab942feac8bb43e13257a2a3f284b8634 -MISC ChangeLog 28802 SHA256 e7423b3a9c80221a3b4b88df359c1222a6ca6406cde01339327f92470017dfa9 SHA512 b9b23741a92b507dd0bc539f5db444cdf39c76535e7a6f1b15b5c8b7663f4c07cdcca567d5fca04ca30d9794830143d945684f09722f240114b8704fc4688945 WHIRLPOOL 6861b4d489e7aef7239e354dc0bbe6c5cecef815465f1f174916e11c4d963e168d0d35650082a6c9e238407d849bd1607cff752b3543b8e6c781f3ebab975729 +EBUILD scribus-9999.ebuild 5894 SHA256 c2624f4a8123a40eda77f9458d1b204e96257117c4dcb34cf4995422431aaa2d SHA512 c37bd7a93e04c8cd1b2e110276427fa2cbf910aaf03c951f2637760b7839e790289fe05b15868c528ebe13015c54f5dd65839e627876b392029a31c834112c8c WHIRLPOOL b4692c024150f9b4d932a9b296c19d2e2b2552b4fc3b0ac1606f988a99cca7d5ac918b98c2351213aaed26e7ed4e250426a8cfdac85accf4038235944dbb6ed5 +MISC ChangeLog 28935 SHA256 255a6c3f44841864e67b4a39f35d3921664b5d904fff92bbbf72e2c49c494efd SHA512 beba5bd52684e9f15c0cd1bcdac96b4a0ebfd904a9ff84c5656c0908b521e2c8a8b9afe49ab86a8b971f26dbe62fe50287a95baa61ab834531618c1b59a9e0cd WHIRLPOOL 615beec688d214ce5b74a41d5effbd1e68ed11b3d2fb20fd05e0476577513e09b30b94370cad47bd0e674e391a9f7e67199ffd59c204546d80f33e3cfd95c451 MISC metadata.xml 900 SHA256 279e9a6f69c420d77bf8859a68f81638032fbf83c0d61d084d68dcbb52830dde SHA512 89d13f2a0a895bfe0b01e30839483d96e25b26164c5a5566bc18fcbb92a2e56a8daef5fbc4478d35aecdad327c7905393f2299007cbf866bdd0543b2eaab30f7 WHIRLPOOL b31847ab5b0274431dc4b3bceab9b5d22235fca15b261046d80f5df661d831f19297cc792e07fe373b157617b65da7f591e231e5a85b34fb78bd67324296b491 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCgBmBQJVdTpEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCgBmBQJVfyfCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF -OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmidk0QAKqx4M3FGvWtNqMvRRSzZfPi -HAnby5GLGJcbxCKzr/sTO5IYJQciWq6IHDdIsHRUeVAo5ut5vo03dbOs4JEbfW0s -IGKFfqOBFJPKMevwKAU726CbzH+rv1PkrswdseOPkRta/DRLUOK3EeV3rnoDncqF -XESwmWZY7wfNUtZxhyf3dkGDRn8aimfDb8cSOSGPkdcPtDA2GOKhwdLU/0SpuhWw -Kzcf1J0feZe5spU2O2jybxJmdo0UPhWYRIxsmo4eQcLH0CVf/PmNTGCLVneC4MF0 -0Nrp7gactcGGBXr9eA3p5H2wDuVVEYhCoq8bcs74OsjZtdG0AY7VPK4rYYC1XRlm -owLkpDnZMnDxn/txqOYGQRFz0OwXnPqi4s/cSa4JXilnoJsv0FLkDAT17mCMnV0S -CfxkbUyNPUuPlPa28TLDz0h3WWFT31N6UQlNdr96LDXR6bDA/e2Y1XCLCh9qWNkW -qpFADkuJiBO9NN2BEssPtNd370afTJilFNBbfAfmUwXwQVCIQAl+NYnTCGTWXPhb -Ue1MFqbOMw9Pvmqj8bv+/PAPrLkD28TXG3fy57LGQiLqZqyiOKBqAQHEB7mQlyef -P7PeUAYth+cB4Urmz6Jy7m/V8GJjrCb8VQ7ejNSpHAzkShvszYW5vZNimIVpQVJj -dIp0H8qfTuzYbICohdcJ -=HS7q +OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmid3sQAKNZAKoh0TzAx+EnptgP6ZV/ +x3sk8vwNIDYLJ58WuvLxSCNeeClsV6WuBuDx+pZmyajWGQG1VnOInxyM/KEE6exe +lNaYgWaWJBT339aEx1+dpZaA+BB2jIQ/1KGfHqExuZmS7YZFKC51qRuXhpQ2fszr +MueE1hvUSvJwte3oJ1OZt2P2rxGtm3F0vqHFBrvuxfDIaKLFa98qXveOczzuuyir +AkjQBnybvOG6lTKtmn8UqAhkB7d6U/iqWR9Tctd8MUzL6yjtSl/L6o02n6OumPcM +U9zzIv3L1i5RNxv7zi5kMvVagJWey2v4yzQHd8pnFbxsPdl9nrTXxMs4SgH6ZuSg +QNZt0kJDs9OE80rztWIMKZ5Gr1eHfYOMGNxJLHVT+R2AWl3zD97yQYWvva+HaIq2 +Si8766eXL6eOej//aLuFHXSpcjnly71U7HzvpbzlYiH2CyLO/uEMnbJKMBIWwKhC +By+TSEcgQdu+UjX04O8F+GRuRQIu2m1sGh+tLko7KzUbnvU3NCRFA3FZKi4Bn6mN +ydygesHLIXT88kNEgNmqN19PMWg1Mv4w80PTzk0hpls9x7/gEqTPUKBUtJYBpHa5 +BbDfa5S0eHVTS94GEZ6WKXkUy1DxSG7OhcI709e5jL/iSkPytvDq2bUznvSIYIex +f8XrwoBA4RFr2bphOvzt +=RM74 -----END PGP SIGNATURE----- diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index ed64087a32c9..3911b24e548d 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.16 2015/05/29 09:37:12 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-9999.ebuild,v 1.17 2015/06/15 19:30:04 jlec Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="tk?" +CMAKE_MAKEFILE_GENERATOR=ninja inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1 subversion @@ -168,7 +169,7 @@ src_install() { EOF dodoc "${T}"/COPYING docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} - doicon resources/icons/scribus.png + doicon resources/iconsets/*/scribus.png domenu scribus.desktop } @@ -183,22 +184,21 @@ pkg_postrm() { } safe_delete () { - case $1 in - dir) - if [[ -d "${2}" ]]; then + if path_exists $2; then + case $1 in + dir) ebegin "Deleting ${2} recursively" rm -r "${2}" || die eend $? - fi - ;; - file) - if [[ -f "${2}" ]]; then + ;; + file) ebegin "Deleting ${2}" rm "${2}" || die eend $? - fi - ;; - *) - die "Wrong usage" - esac + ;; + *) + die "Wrong usage" + ;; + esac + fi } |