From e4ded7c20fa5ab1af9c0f536a13f51316c1cead3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 26 Jan 2012 14:08:02 +0100
Subject: [PATCH] parted: update to 3.0, bump api_depends.

---
 common/shlibs                           |  2 +-
 srcpkgs/parted/depends                  |  2 +-
 srcpkgs/parted/libparted-devel.template | 13 ++++---------
 srcpkgs/parted/libparted.template       |  8 ++------
 srcpkgs/parted/parted.rshlibs           |  2 +-
 srcpkgs/parted/template                 | 11 ++++-------
 6 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 11e8ecf392a..955fe94d88a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -424,7 +424,7 @@ libcap-ng.so.0			libcap-ng		libcap-ng-devel
 libhandle.so.1			xfsprogs-libs		xfsprogs-devel
 libphysfs.so.1			physfs			physfs-devel
 libSDL_ttf-2.0.so.0		SDL_ttf			SDL_ttf-devel
-libparted.so.0			libparted		libparted-devel
+libparted.so.1			libparted		libparted-devel
 libopenobex.so.1		libopenobex		libopenobex-devel
 libntfs-3g.so.81		ntfs-3g			ntfs-3g-devel
 libruby.so.1.9			ruby			ruby-devel
diff --git a/srcpkgs/parted/depends b/srcpkgs/parted/depends
index 012b7194eeb..4d56f5da683 100644
--- a/srcpkgs/parted/depends
+++ b/srcpkgs/parted/depends
@@ -1,2 +1,2 @@
-abi_depends=">=2.1"
+abi_depends=">=3.0"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/parted/libparted-devel.template b/srcpkgs/parted/libparted-devel.template
index 9c0091c65b1..28beaf8f598 100644
--- a/srcpkgs/parted/libparted-devel.template
+++ b/srcpkgs/parted/libparted-devel.template
@@ -6,15 +6,10 @@ long_desc="${long_desc}
  This package contains the static library and header files for libparted, which
  are really only of interest to parted developers."
 
-Add_dependency run libuuid-devel
-Add_dependency run libblkid-devel
-Add_dependency run device-mapper-devel
 Add_dependency run libparted
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libparted*.* ${DESTDIR}/usr/lib
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
 }
diff --git a/srcpkgs/parted/libparted.template b/srcpkgs/parted/libparted.template
index c8cf71b0e0e..6e06c0ad420 100644
--- a/srcpkgs/parted/libparted.template
+++ b/srcpkgs/parted/libparted.template
@@ -1,14 +1,10 @@
 # Template file for 'libparted'.
 #
-revision=1
 short_desc="The GNU Parted disk partitioning shared library"
 long_desc="${long_desc}
 
  This package contains libparted, the required shared library used by Parted."
 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/libparted*.so* ${DESTDIR}/usr/lib
+do_install() {
+	vmove "usr/lib/libparted.so*" usr/lib
 }
diff --git a/srcpkgs/parted/parted.rshlibs b/srcpkgs/parted/parted.rshlibs
index 8c91a0f4661..657fc12b72a 100644
--- a/srcpkgs/parted/parted.rshlibs
+++ b/srcpkgs/parted/parted.rshlibs
@@ -1,4 +1,4 @@
-libparted.so.0
 libc.so.6
 libreadline.so.6
 libncursesw.so.6
+libparted.so.1
diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template
index 03a6c108b17..b9977d5dbe8 100644
--- a/srcpkgs/parted/template
+++ b/srcpkgs/parted/template
@@ -1,16 +1,14 @@
 # Template file for 'parted'
 pkgname=parted
-version=2.4
+version=3.0
 distfiles="http://ftp.gnu.org/gnu/parted/parted-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--without-included-regex --with-gnu-ld
---disable-rpath --disable-debug"
-revision=1
+configure_args="--without-included-regex --disable-rpath --disable-debug"
 short_desc="The GNU Parted disk partition resizing program"
 homepage="http://www.gnu.org/software/parted/"
 license="GPL3"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=508ff75591b9c8cc9d06f1e0b1db1a082a4b0c1b9d4efaac48b4ca46370d9073
+checksum=2a840865fe5bc71f3c2599f30ed6190f6ff8a50834077b2ba9ab0639e55e9e14
 long_desc="
  GNU Parted is a program that allows you to create, destroy, resize, move and
  copy hard disk partitions. This is useful for creating space for new
@@ -18,8 +16,7 @@ long_desc="
 
 subpackages="libparted libparted-devel"
 
-
-Add_dependency build xz
+Add_dependency build pkg-config
 Add_dependency build libuuid-devel
 Add_dependency build libblkid-devel
 Add_dependency build ncurses-devel