From 60fbc64cdc3e1380cb97550a2659a180a102c349 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 27 Dec 2014 13:39:35 +0100
Subject: [PATCH] marble: there's no point in splitting it into
 libmarble{,-devel}.

Merge libmarble into the main pkg and create a -devel subpkg.
---
 common/shlibs           |  4 ++--
 srcpkgs/libmarble       |  1 -
 srcpkgs/libmarble-devel |  1 -
 srcpkgs/marble/template | 15 +++++----------
 4 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 120000 srcpkgs/libmarble
 delete mode 120000 srcpkgs/libmarble-devel

diff --git a/common/shlibs b/common/shlibs
index 78e3f7c6653..5d493fc83b2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1878,8 +1878,8 @@ libdruntime-ldc-debug.so.66 ldc-runtime-0.15.1_1
 libdruntime-ldc.so.66 ldc-runtime-0.15.1_1
 libphobos2-ldc.so.66 ldc-runtime-0.15.1_1
 libphobos2-ldc-debug.so.66 ldc-runtime-0.15.1_1
-libmarblewidget.so.19 libmarble-4.14.3_1
-libastro.so.1 libmarble-4.14.3_1
+libmarblewidget.so.19 marble-4.14.3_2
+libastro.so.1 marble-4.14.3_2
 libparrot.so.6.9.0 parrot-6.9.0_1
 libkipi.so.11 libkipi-4.14.3_1
 libasr.so.0 libasr-1.0.0_1
diff --git a/srcpkgs/libmarble b/srcpkgs/libmarble
deleted file mode 120000
index f208786e0b7..00000000000
--- a/srcpkgs/libmarble
+++ /dev/null
@@ -1 +0,0 @@
-marble
\ No newline at end of file
diff --git a/srcpkgs/libmarble-devel b/srcpkgs/libmarble-devel
deleted file mode 120000
index f208786e0b7..00000000000
--- a/srcpkgs/libmarble-devel
+++ /dev/null
@@ -1 +0,0 @@
-marble
\ No newline at end of file
diff --git a/srcpkgs/marble/template b/srcpkgs/marble/template
index bac93009b8f..e76ec2f0ce1 100644
--- a/srcpkgs/marble/template
+++ b/srcpkgs/marble/template
@@ -3,7 +3,7 @@
 
 pkgname=marble
 version=4.14.3
-revision=1
+revision=2
 maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
 homepage="hhttps://marble.kde.org"
 license="GPL-3"
@@ -11,19 +11,14 @@ short_desc="Virtual globe and world atlas"
 build_style=cmake
 hostmakedepends="cmake automoc4 pkg-config"
 makedepends="libressl-devel qt-devel kdelibs-devel phonon-devel"
+replaces="libmarble>=0"
 distfiles="http://download.kde.org/stable/${version}/src/marble-${version}.tar.xz"
 checksum="4d6667cf67ae9976e4c1efc306be222d13f2ee5927483325411ae0e9631dc0f0"
 
-libmarble_package() {
-    short_desc+=" - library"
-    pkg_install() {
-        vmove "usr/lib/*.so.*"
-    }
-}
-
-libmarble-devel_package() {
+marble-devel_package() {
+    replaces="libmarble-devel>=0"
     short_desc+=" - development files"
-    depends="libmarble>=${version}_${revision}"
+    depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
     pkg_install() {
         vmove usr/include
         vmove "usr/lib/*.so"