Adapt to change in builders, split the package

2 files changed, 54 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9ff5209d5fb5..242fce75f159 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,34 @@
 pkgbase = percolator-git
 	pkgdesc = Software for postprocessing of shotgun proteomics data + format converters + Elude tool
-	pkgver = 2.10.r1.gd92d600
+	pkgver = 2.10.r3.ga08619d
 	pkgrel = 1
 	url = http://per-colator.com/
 	arch = x86_64
-	arch = i686
 	license = Apache
 	makedepends = git
 	makedepends = xsd
 	makedepends = cmake
 	makedepends = boost
 	makedepends = zlib
-	depends = tokyocabinet
 	depends = xerces-c
 	depends = sqlite
-	provides = percolator
-	conflicts = percolator
 	source = source::git+https://github.com/percolator/percolator
 	source = percolator.patch
 	md5sums = SKIP
 	md5sums = 4e1432640f09fa3dc2f3d9894ec380f4
 
-pkgname = percolator-git
+pkgname = percolator
+	pkgdesc = Percolator and qvality, two post processors for shotgun proteomics data.
+	provides = 
+	conflicts = 
+
+pkgname = percolator-converters
+	pkgdesc = Parsers of different database search engines to percolator input format.
+	provides = 
+	conflicts = 
+
+pkgname = elude
+	pkgdesc = Software package for prediction of retention times in mass spectorometry experiments.
+	provides = 
+	conflicts = 
 
diff --git a/PKGBUILD b/PKGBUILD
index a5d5bc8eb643..78e5b0d9f835 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Lev Levitsky <levlev@mail.ru>
-pkgname=percolator-git
-pkgver=2.10.r1.gd92d600
+pkgbase=percolator-git
+pkgname=('percolator' 'percolator-converters' 'elude')
+pkgver=2.10.r3.ga08619d
 pkgrel=1
 pkgdesc="Software for postprocessing of shotgun proteomics data + format converters + Elude tool"
 url="http://per-colator.com/"
 license=('Apache')
-depends=('tokyocabinet' 'xerces-c' 'sqlite')
-arch=('x86_64' 'i686')
-makedepends=('git' 'xsd' 'cmake' 'boost' 'zlib' )
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+depends=('xerces-c' 'sqlite')
+arch=('x86_64')
+makedepends=('git' 'xsd' 'cmake' 'boost' 'zlib')
 source=('source::git+https://github.com/percolator/percolator'
 		'percolator.patch')
 md5sums=('SKIP'
@@ -23,42 +22,57 @@ pkgver() {
 prepare() {
 	cd "${srcdir}/source"
 	patch -p1 -i "$srcdir/${pkgname%-git}.patch"
+	cd "$BUILDDIR"
+	mkdir "${pkgname[@]}"
 }
 
 build() {
-	cd "$BUILDDIR"
-	mkdir percolator converters elude
-	cd percolator
+	cd "$BUILDDIR"/percolator
 	echo "------------------------"
 	echo "Building percolator ..."
 	echo "------------------------"
-	cmake "${srcdir}/source"
+	cmake -DTARGET_ARCH=amd64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DXML_SUPPORT=ON "${srcdir}/source"
 	make
 	echo "------------------------"
 	echo "Building converters ..."
 	echo "------------------------"
-	cd ../converters
-	cmake -DSERIALIZE="TokyoCabinet" "${srcdir}/source/src/converters"
+	cd ../percolator-converters
+	cmake -DTARGET_ARCH=amd64 -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release "${srcdir}/source/src/converters"
 	make
 	echo "------------------------"
 	echo "Building Elude ..."
 	echo "------------------------"
 	cd ../elude
-	cmake "${srcdir}/source/src/elude_tool"
+	cmake -DTARGET_ARCH=amd64 -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release "${srcdir}/source/src/elude_tool"
 	make
 }
 
-package() {
-	cd "$BUILDDIR/percolator"
+package_percolator() {
+	pkgdesc="Percolator and qvality, two post processors for shotgun proteomics data."
+	name="${pkgname[0]}"
+	provides=("$name")
+	conflicts=("$name")
+	
+	cd "$BUILDDIR/$name"
 	make DESTDIR="$pkgdir/" install
-	cd "$BUILDDIR/converters"
-	make DESTDIR="$pkgdir/" install
-	cd "$BUILDDIR/elude"
+}
+
+package_percolator-converters() {
+	pkgdesc="Parsers of different database search engines to percolator input format."
+	name="${pkgname[1]}"
+	provides=("$name")
+	conflicts=("$name")
+	
+	cd "$BUILDDIR/$name"
 	make DESTDIR="$pkgdir/" install
-	install -D "${srcdir}/source/license.txt" "${pkgdir}/usr/share/licenses/percolator/license.txt"
-	install -d "$pkgdir/usr/bin"
-	install -d "$pkgdir/usr/share/${pkgname%-git}"
-	mv "$pkgdir"/usr/local/share/* "$pkgdir/usr/share/${pkgname%-git}"
-	mv "$pkgdir"/usr/local/bin/* "$pkgdir/usr/bin"
-	rm -r "$pkgdir/usr/local"
 }
+
+package_elude() {
+	pkgdesc="Software package for prediction of retention times in mass spectorometry experiments."
+	name="${pkgname[2]}"
+	provides=("$name")
+	conflicts=("$name")
+	
+	cd "$BUILDDIR/$name"
+	make DESTDIR="$pkgdir/" install
+}
\ No newline at end of file