"sync" with repos

2 files changed, 107 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f93682dee6e6..586c6938fbd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = marble-git
 	pkgdesc = Desktop Globe. (GIT version)
-	pkgver = v15.03.97.271.g61eb85f
+	pkgver = v15.08.0.159.g30a9448
 	pkgrel = 1
 	url = https://www.kde.org/applications/system/marble
-	install = marble-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -19,11 +18,25 @@ pkgbase = marble-git
 	makedepends = qt5-webkit
 	makedepends = krunner
 	makedepends = python
+	makedepends = qt5-webkit
+	makedepends = qt5-tools
+	makedepends = kparts
+	makedepends = knewstuff
+	makedepends = opencv
+	makedepends = hicolor-icon-theme
+	source = git://anongit.kde.org/marble.git
+	sha1sums = SKIP
+
+pkgname = marble-git
+	install = marble-git.install
+	groups = kde-applications
+	groups = kdeedu
+	depends = libastro-git
+	depends = marble-data-git
 	depends = qt5-webkit
 	depends = kparts
 	depends = knewstuff
 	depends = opencv
-	depends = hicolor-icon-theme
 	optdepends = gpsd: position information via gpsd
 	optdepends = quazip-qt5: reading and displaying .kmz files
 	optdepends = shapelib: reading and displaying .shp files
@@ -31,12 +44,26 @@ pkgbase = marble-git
 	optdepends = libwlocate: Position information based on neighboring WLAN networks
 	optdepends = phonon-qt5: That enables the use of audio and video content
 	optdepends = krunner: Krunner plugin for marble
-	provides = marble
+	conflicts = kdeedu-marble<15.04.3-3
+	conflicts = marble-qt
 	conflicts = marble
+	replaces = kdeedu-marble
+	replaces = marble-qt<15.07
+
+pkgname = libastro-git
+	pkgdesc = Marble astronomy library
+	depends = gcc-libs
+	conflicts = kdeedu-marble<15.07
 	conflicts = marble-qt
-	conflicts = kdeedu-marble
-	source = git://anongit.kde.org/marble.git
-	sha1sums = SKIP
+	conflicts = libastro
 
-pkgname = marble-git
+pkgname = marble-data-git
+	pkgdesc = Data for Marble
+	install = marble-git.install
+	arch = any
+	depends = hicolor-icon-theme
+	conflicts = kdeedu-marble<15.07
+	conflicts = marble<15.07.80-3
+	conflicts = marble-qt
+	conflicts = marble-data
 
diff --git a/PKGBUILD b/PKGBUILD
index 0cd2fd9ba6c4..1041ba69a7c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,15 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
-pkgname=marble-git
-pkgver=v15.03.97.271.g61eb85f
+pkgbase=marble-git
+pkgname=('marble-git'
+         'libastro-git'
+         'marble-data-git')
+pkgver=v15.08.0.159.g30a9448
 pkgrel=1
 pkgdesc="Desktop Globe. (GIT version)"
 arch=('i686' 'x86_64')
-url="https://www.kde.org/applications/system/marble"
+url='https://www.kde.org/applications/system/marble'
 license=('GPL')
-provides=('marble')
-conflicts=('marble' 'marble-qt' 'kdeedu-marble' )
-depends=('qt5-webkit'
-         'kparts'
-         'knewstuff'
-         'opencv'
-         'hicolor-icon-theme'
-         )
 makedepends=('cmake'
              'git'
              'gpsd'
@@ -27,17 +22,15 @@ makedepends=('cmake'
              'qt5-webkit'
              'krunner'
              'python'
+             'qt5-webkit'
+             'qt5-tools'
+             'kparts'
+             'knewstuff'
+             'opencv'
+             'hicolor-icon-theme'
              )
-optdepends=('gpsd: position information via gpsd'
-            'quazip-qt5: reading and displaying .kmz files'
-            'shapelib: reading and displaying .shp files'
-            'qextserialport-qt5: reading from serial port in APRS plugin'
-            'libwlocate: Position information based on neighboring WLAN networks'
-            'phonon-qt5: That enables the use of audio and video content'
-            'krunner: Krunner plugin for marble')
 source=('git://anongit.kde.org/marble.git')
 sha1sums=('SKIP')
-install=marble-git.install
 
 pkgver() {
   cd marble
@@ -74,6 +67,65 @@ build() {
   make
 }
 
-package() {
+package_libastro-git() {
+  pkgdesc='Marble astronomy library'
+  depends=('gcc-libs')
+  conflicts=('kdeedu-marble<15.07'
+             'marble-qt'
+             'libastro'
+             )
+
+  make -C build/src/lib/astro DESTDIR="${pkgdir}" install
+}
+
+package_marble-git() {
+  depends=('libastro-git'
+           'marble-data-git'
+           'qt5-webkit'
+           'kparts'
+           'knewstuff'
+           'opencv'
+           )
+  optdepends=('gpsd: position information via gpsd'
+              'quazip-qt5: reading and displaying .kmz files'
+              'shapelib: reading and displaying .shp files'
+              'qextserialport-qt5: reading from serial port in APRS plugin'
+              'libwlocate: Position information based on neighboring WLAN networks'
+              'phonon-qt5: That enables the use of audio and video content'
+              'krunner: Krunner plugin for marble'
+              )
+  conflicts=('kdeedu-marble<15.04.3-3'
+             'marble-qt'
+             'marble'
+             )
+  replaces=('kdeedu-marble'
+            'marble-qt<15.07'
+            )
+  groups=('kde-applications'
+          'kdeedu'
+          )
+  install=marble-git.install
+
   make -C build DESTDIR="${pkgdir}" install
+
+  # provided by libastro
+  rm -r "${pkgdir}/usr/include/astro"
+  rm "${pkgdir}/usr/lib/"libastro.*
+
+  # provided by marble-data
+  rm -r "${pkgdir}/usr/share/"{icons,marble/data}
+}
+
+package_marble-data-git() {
+  pkgdesc='Data for Marble'
+  arch=('any')
+  depends=('hicolor-icon-theme')
+  conflicts=('kdeedu-marble<15.07'
+             'marble<15.07.80-3'
+             'marble-qt'
+             'marble-data'
+             )
+  install=marble-git.install
+
+  make -C build/data DESTDIR="${pkgdir}" install
 }