db: split libdb_cxx into its own subpkg "libdb-cxx".

common/shlibs

@@ -168,7 +168,7 @@ libgstrtp-0.10.so.0		gst-plugins-base	gst-plugins-base-devel
 libbfd-2.21.so			binutils		binutils-devel
 libopcodes-2.21.so		binutils		binutils-devel
 libdb-4.8.so			libdb			db-devel
-libdb_cxx-4.8.so		libdb			db-devel
+libdb_cxx-4.8.so		libdb-cxx		db-devel
 libgdbm.so.4			gdbm			gdbm-devel
 libgdbm_compat.so.4		gdbm			gdbm-devel
 libgettextsrc-0.18.1.so		gettext-libs		gettext-devel

srcpkgs/db/db-devel.template

@@ -5,13 +5,13 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run libstdc++-devel
+revision=1
-Add_dependency run libdb
 
-do_install()
+Add_dependency run libdb
-{
+Add_dependency run libdb-cxx
-	mkdir -p ${DESTDIR}/usr/lib
+
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+do_install() {
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+	vmove usr/include usr
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/share usr
 }

srcpkgs/db/depends

@@ -1,2 +1,2 @@
 abi_depends=">=4.8.24"
-api_depends="${abi_depends}"
+api_depends=">=4.8.30_1" # libdb-cxx

srcpkgs/db/libdb-cxx.rshlibs

@@ -0,0 +1,5 @@
+libpthread.so.0
+libstdc++.so.6
+libm.so.6
+libc.so.6
+libgcc_s.so.1

srcpkgs/db/libdb-cxx.template

@@ -0,0 +1,11 @@
+# Template file for 'libdb-cxx'.
+#
+revision=1
+short_desc="${short_desc} - C++ shared libraries"
+long_desc="${long_desc}
+
+ This package contains the C++ shared library for use in client programs."
+
+do_install() {
+	vmove "usr/lib/libdb_cxx*.so*" usr/lib
+}

srcpkgs/db/libdb.rshlibs

@@ -1,5 +1,2 @@
 libpthread.so.0
 libc.so.6
-libstdc++.so.6
-libm.so.6
-libgcc_s.so.1

srcpkgs/db/libdb.template

@@ -1,5 +1,6 @@
 # Template file for 'libdb'.
 #
+revision=1
 short_desc="${short_desc} - shared libraries"
 long_desc="${long_desc}
 
@@ -7,9 +8,7 @@ long_desc="${long_desc}
 
 replaces="db<4.8.26"
 
-
+do_install() {
-do_install()
+	vmove "usr/lib/libdb.so*" usr/lib
-{
+	vmove "usr/lib/libdb-*.so*" usr/lib
-	install -d ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
 }

srcpkgs/db/template

@@ -37,11 +37,9 @@ long_desc="
    records or requiring that new records be added only at the end of the
    database."
 
-subpackages="libdb db-docs db-devel"
+subpackages="libdb libdb-cxx db-docs db-devel"
 
-post_install()
+post_install() {
-{
+	vmove "usr/docs/*" usr/share/doc/${pkgname}-${version}
-	install -d ${DESTDIR}/usr/share/doc/${pkgname}-${version}
-	mv ${DESTDIR}/usr/docs/* ${DESTDIR}/usr/share/doc/${pkgname}-${version}
 	rmdir ${DESTDIR}/usr/docs
 }

srcpkgs/libdb-cxx

@@ -0,0 +1 @@
+db