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

[Andreas Sturmlechner]

commit:     923a081a450ef1ad317a6c04cc9b8e0d7a8a657b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 00:22:14 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 00:27:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=923a081a

app-office/libreoffice: Populate BDEPEND

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/libreoffice/libreoffice-6.2.9999.ebuild | 51 +++++++++++-----------
 app-office/libreoffice/libreoffice-9999.ebuild     | 51 +++++++++++-----------
 2 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
index a8c322b1441..33dcacf28ec 100644
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
@@ -79,6 +79,14 @@ SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	odk? ( >=app-doc/doxygen-1.8.4 )
+"
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-arch/zip
@@ -192,26 +200,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	pdfimport? ( app-text/poppler:=[cxx] )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
 "
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/breeze-icons:* )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
 # FIXME: cppunit should be moved to test conditional
 #        after everything upstream is under gbuild
 #        as dmake execute tests right away
@@ -221,14 +209,9 @@ DEPEND="${COMMON_DEPEND}
 	dev-perl/Archive-Zip
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3
-	dev-util/intltool
 	>=dev-util/mdds-1.4.1:1=
 	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
 	sys-devel/ucpp
-	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt
 	x11-libs/libXtst
@@ -236,7 +219,6 @@ DEPEND="${COMMON_DEPEND}
 		dev-java/ant-core
 		>=virtual/jdk-1.6
 	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
 	test? (
 		app-crypt/gnupg
 		dev-util/cppunit
@@ -244,6 +226,23 @@ DEPEND="${COMMON_DEPEND}
 		media-fonts/liberation-fonts
 	)
 "
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.6 )
+	kde? ( kde-frameworks/breeze-icons:* )
+	vlc? ( media-video/vlc )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
 
 PATCHES=(
 	# master branch

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 375aca4c6b2..33af7c8cd64 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -79,6 +79,14 @@ SLOT="0"
 [[ ${MY_PV} == *9999* ]] || \
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	odk? ( >=app-doc/doxygen-1.8.4 )
+"
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	app-arch/zip
@@ -192,26 +200,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	pdfimport? ( app-text/poppler:=[cxx] )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
 "
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/liberation-fonts
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	kde? ( kde-frameworks/breeze-icons:* )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
-else
-	# Translations are not reliable on live ebuilds
-	# rather force people to use english only.
-	PDEPEND="!app-office/libreoffice-l10n"
-fi
-
 # FIXME: cppunit should be moved to test conditional
 #        after everything upstream is under gbuild
 #        as dmake execute tests right away
@@ -221,14 +209,9 @@ DEPEND="${COMMON_DEPEND}
 	dev-perl/Archive-Zip
 	>=dev-util/cppunit-1.14.0
 	>=dev-util/gperf-3
-	dev-util/intltool
 	>=dev-util/mdds-1.4.1:1=
 	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
 	sys-devel/ucpp
-	virtual/pkgconfig
 	x11-base/xorg-proto
 	x11-libs/libXt
 	x11-libs/libXtst
@@ -236,7 +219,6 @@ DEPEND="${COMMON_DEPEND}
 		dev-java/ant-core
 		>=virtual/jdk-1.6
 	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
 	test? (
 		app-crypt/gnupg
 		dev-util/cppunit
@@ -244,6 +226,23 @@ DEPEND="${COMMON_DEPEND}
 		media-fonts/liberation-fonts
 	)
 "
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( >=virtual/jre-1.6 )
+	kde? ( kde-frameworks/breeze-icons:* )
+	vlc? ( media-video/vlc )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
 
 PATCHES=(
 	# "${WORKDIR}"/${PATCHSET/.tar.xz/}