From b8f3c131fc51fd58923c705a1567967a7287ce47 Mon Sep 17 00:00:00 2001
From: davehome <davehome@redthumb.info.tm>
Date: Tue, 1 Nov 2011 09:47:05 +0000
Subject: [PATCH] mumble: remove unnecessary libmumble subpkg

---
 srcpkgs/libmumble                 |  1 -
 srcpkgs/mumble/libmumble.template | 20 --------------------
 srcpkgs/mumble/murmur.template    |  4 +++-
 srcpkgs/mumble/template           |  9 ++++++---
 4 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 120000 srcpkgs/libmumble
 delete mode 100644 srcpkgs/mumble/libmumble.template

diff --git a/srcpkgs/libmumble b/srcpkgs/libmumble
deleted file mode 120000
index cdf19fe6205..00000000000
--- a/srcpkgs/libmumble
+++ /dev/null
@@ -1 +0,0 @@
-mumble
\ No newline at end of file
diff --git a/srcpkgs/mumble/libmumble.template b/srcpkgs/mumble/libmumble.template
deleted file mode 100644
index 63c83a6fd64..00000000000
--- a/srcpkgs/mumble/libmumble.template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'libmumble'.
-#
-short_desc="${short_desc} Runtime library"
-long_desc="${long_desc}
-
- This package contains the Mumble runtime lib(s)."
-
-Add_dependency run glibc
-Add_dependency run libstdc++
-Add_dependency run qt
-Add_dependency run libgcc
-
-do_install()
-{
-	vmkdir usr/lib/mumble
-	cp ${wrksrc}/release/*.so* ${DESTDIR}/usr/lib/mumble
-	cp ${wrksrc}/release/plugins/* ${DESTDIR}/usr/lib/mumble	
-}
-
-
diff --git a/srcpkgs/mumble/murmur.template b/srcpkgs/mumble/murmur.template
index d20370aa334..101a89c9727 100644
--- a/srcpkgs/mumble/murmur.template
+++ b/srcpkgs/mumble/murmur.template
@@ -14,9 +14,11 @@ Add_dependency run libssl
 Add_dependency run avahi-compat-libs
 Add_dependency run libstdc++
 Add_dependency run libgcc
-Add_dependency run libmumble
+Add_dependency run mumble
 Add_dependency run qt-plugin-sqlite
 
+revision=1
+
 do_install()
 {
 	vmkdir usr/bin
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 476194b1419..25599e30a0e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.2.3
-revision=2
+revision=3
 homepage="http://mumble.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 short_desc="Open source, low-latency, high quality voice chat for gaming"
@@ -16,7 +16,8 @@ long_desc="
  or about Mumble and Murmur the whole voice chat application suite."
 
 disable_parallel_build=yes
-subpackages="lib${pkgname} murmur"
+subpackages="murmur"
+replaces="libmumble<=1.2.3"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run glibc
@@ -34,7 +35,6 @@ Add_dependency run MesaLib
 Add_dependency run libstdc++
 Add_dependency run libgcc
 Add_dependency run libogg
-Add_dependency run libmumble
 Add_dependency run qt-plugin-sqlite
 
 Add_dependency build libcap-devel
@@ -74,12 +74,15 @@ do_build()
 do_install()
 {
 	vmkdir usr/bin
+	vmkdir usr/lib/mumble
 	vmkdir usr/share/applications
 	vmkdir usr/share/man/man1
 	vmkdir usr/share/icons/hicolor/scalable/apps
 
 	cp ${wrksrc}/release/mumble ${DESTDIR}/usr/bin
 	cp ${wrksrc}/release/mumble11x ${DESTDIR}/usr/bin
+	cp ${wrksrc}/release/*.so* ${DESTDIR}/usr/lib/mumble
+	cp ${wrksrc}/release/plugins/* ${DESTDIR}/usr/lib/mumble
 
 	cp ${wrksrc}/scripts/mumble.desktop ${DESTDIR}/usr/share/applications
 	cp ${wrksrc}/man/mumble{,11x}.1 ${DESTDIR}/usr/share/man/man1