From a41251559cd5af40ce6490d14ade2b436b4d8487 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 17 Feb 2011 11:28:41 +0100
Subject: [PATCH] sg3_utils: update to 1.31, added libsgutils subpkg.

---
 srcpkgs/libsgutils                         |  1 +
 srcpkgs/sg3_utils/libsgutils.template      | 15 +++++++++++++++
 srcpkgs/sg3_utils/sg3_utils-devel.template |  6 ++----
 srcpkgs/sg3_utils/template                 |  8 ++++----
 xbps-src/common/mapping_shlib_binpkg.txt   |  2 +-
 5 files changed, 23 insertions(+), 9 deletions(-)
 create mode 120000 srcpkgs/libsgutils
 create mode 100644 srcpkgs/sg3_utils/libsgutils.template

diff --git a/srcpkgs/libsgutils b/srcpkgs/libsgutils
new file mode 120000
index 00000000000..8f4ca08829d
--- /dev/null
+++ b/srcpkgs/libsgutils
@@ -0,0 +1 @@
+sg3_utils
\ No newline at end of file
diff --git a/srcpkgs/sg3_utils/libsgutils.template b/srcpkgs/sg3_utils/libsgutils.template
new file mode 100644
index 00000000000..d98107386f6
--- /dev/null
+++ b/srcpkgs/sg3_utils/libsgutils.template
@@ -0,0 +1,15 @@
+# Template file for 'libsgutils'.
+#
+short_desc="${sourcepkg} - shared library"
+long_desc="${long_desc}
+
+ This package contains the shared library."
+
+replaces="sg3_utils<1.31"
+Add_dependency run glibc
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/sg3_utils/sg3_utils-devel.template b/srcpkgs/sg3_utils/sg3_utils-devel.template
index 3aa2d55861c..22df2ba605a 100644
--- a/srcpkgs/sg3_utils/sg3_utils-devel.template
+++ b/srcpkgs/sg3_utils/sg3_utils-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'sg3_utils-devel'.
 #
-short_desc="${sourcepkg} development files"
+short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency run glibc-devel
-Add_dependency run sg3_utils
+Add_dependency run libsgutils
 
 do_install()
 {
diff --git a/srcpkgs/sg3_utils/template b/srcpkgs/sg3_utils/template
index e7de6d8edb7..780fcfb1c26 100644
--- a/srcpkgs/sg3_utils/template
+++ b/srcpkgs/sg3_utils/template
@@ -1,12 +1,11 @@
 # Template file for 'sg3_utils'
 pkgname=sg3_utils
-version=1.28
-revision=1
+version=1.31
 distfiles="http://sg.danny.cz/sg/p/$pkgname-$version.tgz"
 build_style=gnu_configure
 short_desc="Generic SCSI utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=da8bd627a6246b709e2a0321fa9d5ca09a33354a1ae40c74cd37efb69b9f8118
+checksum=d84b38b61f0ca3941eb1c48a5858f93d1d1b70a623e579f5ecce2440e18410a4
 long_desc="
  This package contains low level utilities for devices that use a SCSI
  command set. Apart from SCSI parallel interface (SPI) devices, the SCSI
@@ -14,6 +13,7 @@ long_desc="
  devices, Fibre Channel disks, IEEE 1394 storage devices (that use the
  'SBP' protocol), SAS, iSCSI and FCoE devices (amongst others)"
  
-subpackages="$pkgname-devel"
+subpackages="libsgutils $pkgname-devel"
 Add_dependency run glibc
+Add_dependency run libsgutils
 Add_dependency build pkg-config
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 55785df4371..ac70655f986 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -610,7 +610,7 @@ libboost_regex.so.1.44		boost			boost-devel
 libboost_wserialization.so.1.44	boost			boost-devel
 libexempi.so			exempi			exempi-devel
 libatasmart.so			libatasmart		libatasmart-devel
-libsgutils2.so			sg3_utils		sg3_utils-devel
+libsgutils2.so			libsgutils		sg3_utils-devel
 liblvm2app.so.2			liblvm2app		liblvm2app-devel
 libgdu.so			gnome-disk-utility	gnome-disk-utility-devel
 libgdu-gtk.so			gnome-disk-utility	gnome-disk-utility-devel