[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     ab03f47c737d10ec7def3aea88efdcb76c48e822
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 20:47:49 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 20:48:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab03f47c

app-office/libreoffice: Version bump without keywords, use http URI

Package-Manager: portage-2.2.20.1

 app-office/libreoffice/Manifest                                   | 4 ++--
 app-office/libreoffice/libreoffice-4.4.5.2.ebuild                 | 2 +-
 app-office/libreoffice/libreoffice-4.4.9999.ebuild                | 2 +-
 .../{libreoffice-5.0.0.5.ebuild => libreoffice-5.0.1.2.ebuild}    | 8 ++------
 app-office/libreoffice/libreoffice-5.0.9999.ebuild                | 2 +-
 app-office/libreoffice/libreoffice-9999.ebuild                    | 4 ++--
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2e077e6..69e2eaf 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -8,8 +8,8 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51
 DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
 DIST libreoffice-4.4.4.3.tar.xz 164365608 SHA256 31ac86daa4f842fe825c88262b99a032ba3c0620f6e01cb22a54af14bc3dda72 SHA512 fbe97d4f8db92348927dc7c8412631ad5187968357ebdc57f22936cea84c76ced3655aac4c6ebc936b0f96d3d36bafe163eea05ed2dca02e53724bd5a0396513 WHIRLPOOL a7938d94b8644cd736a7213c0c4931a9d857da7005972bc751f6157445839ce395fdb1b6b057dc6fd681cf86143cfe96c9b2126fef2d5de5ea000eb15c5bdb35
 DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
-DIST libreoffice-5.0.0.5.tar.xz 166444400 SHA256 9b17f5848ecbe5302ff676abaa187f49ddc35bed1a56898b7e3e0b3e152dce10 SHA512 e7dc99f5c055ef4507ba5b61e39d242cf0337f30b525d172b54f7ce1b4e2ed2c6757bb2a5a3f18b9a8593d6bd43436ea1d067ea653735918812e7820f50996e8 WHIRLPOOL 1f09eb00727c59463dab5201d0115ecb05e25c860e2486e56b679af2adddfa0ddec93fe880b8b3991a8e4139aef25dd71c6138f6e643e7ae78c8d820b6b94f2c
+DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-4.4.4.3.tar.xz 1876068 SHA256 80d2cb4c5ee1d97218741d4e65351763dd74a617df7a51fce275983bcc5e6bc9 SHA512 b3d05ab85b1c25c3cc045c7d5217fb61b8dfc54b58c54a04b442c678d2c51975e5aadf3e28ac3f17544dd7afd6770fd8115cd05e3878b80c378b8fed6bcc2b22 WHIRLPOOL 3204cfac0ef6d2cd741e2f319242da6943b46c82ba5635df45dc1f99c3049a542df00a31c4b48092bcfad1a6d6f5d4e3c1ba0a3248331c324c08d728f909cb27
 DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
-DIST libreoffice-help-5.0.0.5.tar.xz 1882344 SHA256 9b515f8890a19166d2193f5e2b76dea334b2399d0e976fdd355f6e3feaaa98a3 SHA512 1ddb723ba732f7b4836a3b669c1dfc8f8534d2ac7d5cf8ed2d76dffe98d82e6e5bf560aec1492b8caec1e97477f819fba124cf595d1678979d04f57730be9ba8 WHIRLPOOL 009bac04f4b3025ac82739ccd316ce92fc5dcfe7bde6d11468b09a926e345b09d16cdf1a7a6bfd0e3e44d79879c80fe5193186fbff30721309b4b0a2798b649e
+DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86

diff --git a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
index 483f82c..5341429 100644
--- a/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.5.2.ebuild
@@ -32,7 +32,7 @@ unset SCM_ECLASS
 
 DESCRIPTION="LibreOffice, a full office productivity suite"
 HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
 
 # Split modules following git/tarballs

diff --git a/app-office/libreoffice/libreoffice-4.4.9999.ebuild b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
index 483f82c..5341429 100644
--- a/app-office/libreoffice/libreoffice-4.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.4.9999.ebuild
@@ -32,7 +32,7 @@ unset SCM_ECLASS
 
 DESCRIPTION="LibreOffice, a full office productivity suite"
 HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
 
 # Split modules following git/tarballs

diff --git a/app-office/libreoffice/libreoffice-5.0.0.5.ebuild b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
similarity index 98%
rename from app-office/libreoffice/libreoffice-5.0.0.5.ebuild
rename to app-office/libreoffice/libreoffice-5.0.1.2.ebuild
index 6dfe1c8..5cb165c 100644
--- a/app-office/libreoffice/libreoffice-5.0.0.5.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.1.2.ebuild
@@ -32,7 +32,7 @@ unset SCM_ECLASS
 
 DESCRIPTION="LibreOffice, a full office productivity suite"
 HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
 
 # Split modules following git/tarballs
@@ -198,8 +198,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 if [[ ${PV} != *9999* ]]; then
-	#PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-	PDEPEND=">=app-office/libreoffice-l10n-4.4"
+	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
 else
 	# Translations are not reliable on live ebuilds
 	# rather force people to use english only.
@@ -246,9 +245,6 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-
-	# from master branch
-	"${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch"
 )
 
 REQUIRED_USE="

diff --git a/app-office/libreoffice/libreoffice-5.0.9999.ebuild b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
index 5731d32..47bf9d1 100644
--- a/app-office/libreoffice/libreoffice-5.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.9999.ebuild
@@ -32,7 +32,7 @@ unset SCM_ECLASS
 
 DESCRIPTION="LibreOffice, a full office productivity suite"
 HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
 
 # Split modules following git/tarballs

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index eb6f83c..9588001 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -32,7 +32,7 @@ unset SCM_ECLASS
 
 DESCRIPTION="LibreOffice, a full office productivity suite"
 HOMEPAGE="http://www.libreoffice.org"
-SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
 
 # Split modules following git/tarballs
@@ -104,7 +104,7 @@ COMMON_DEPEND="
 	>=app-text/libetonyek-0.1.2
 	app-text/liblangtag
 	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.5
+	>=app-text/libmwaw-0.3.6
 	>=app-text/libodfgen-0.1.0
 	app-text/libwpd:0.10[tools]
 	app-text/libwpg:0.3