Use unpacker eclass for unpacking the .deb. Fix changelog doc install.

(Portage version: 2.2.0_alpha164/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

6 files changed, 19 insertions, 51 deletions

diff --git a/app-backup/spideroak-bin/ChangeLog b/app-backup/spideroak-bin/ChangeLog
index 4e4317a2b2c5..7d5d477f5134 100644
--- a/app-backup/spideroak-bin/ChangeLog
+++ b/app-backup/spideroak-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-backup/spideroak-bin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/ChangeLog,v 1.32 2013/03/17 15:12:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/ChangeLog,v 1.33 2013/03/23 19:44:29 vapier Exp $
+
+  23 Mar 2013; Mike Frysinger <vapier@gentoo.org> spideroak-bin-4.1.9860.ebuild,
+  spideroak-bin-4.5.9941.ebuild, spideroak-bin-4.6.9945.ebuild,
+  spideroak-bin-4.7.9948.ebuild, spideroak-bin-4.8.3-r1.ebuild:
+  Use unpacker eclass for unpacking the .deb.  Fix changelog doc install.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild
index 3725c1b9e0dc..1057885023d2 100644
--- a/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild,v 1.5 2013/03/02 19:12:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.1.9860.ebuild,v 1.6 2013/03/23 19:44:29 vapier Exp $
 
 EAPI=4
 
-inherit eutils versionator
+inherit eutils versionator unpacker
 
 REV=$(get_version_component_range 3)
 SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
@@ -38,12 +38,6 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-}
-
 src_prepare() {
 	# change /usr/ to /opt/SpiderOak/ in start script
 	sed -i 's:/usr/lib:/opt:g' usr/bin/SpiderOak || die "sed failed"
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild
index b21c952e719a..6e6e910aab5e 100644
--- a/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild,v 1.3 2013/03/02 19:12:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.5.9941.ebuild,v 1.4 2013/03/23 19:44:29 vapier Exp $
 
 EAPI="4"
 
-inherit eutils versionator
+inherit eutils versionator unpacker
 
 REV=$(get_version_component_range 3)
 SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
@@ -58,13 +58,6 @@ S=${WORKDIR}
 
 QA_PREBUILT="*"
 
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-	rm -f usr/share/doc/spideroak/copyright
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/opt-path.patch
 	use headless && epatch "${FILESDIR}"/headless.patch
@@ -131,8 +124,7 @@ src_install() {
 	doins -r etc
 
 	#install the changelog
-	insinto /usr/share/doc/${P}
-	doins usr/share/doc/spideroak/changelog.gz
+	dodoc usr/share/doc/spideroak/changelog.gz
 
 	if ! use headless ; then
 		domenu usr/share/applications/spideroak.desktop
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild
index fefc83a9e0ca..a43130ca3215 100644
--- a/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild,v 1.3 2013/03/02 19:12:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.6.9945.ebuild,v 1.4 2013/03/23 19:44:29 vapier Exp $
 
 EAPI="4"
 
-inherit eutils versionator
+inherit eutils versionator unpacker
 
 REV=$(get_version_component_range 3)
 SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
@@ -58,13 +58,6 @@ S=${WORKDIR}
 
 QA_PREBUILT="*"
 
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-	rm -f usr/share/doc/spideroak/copyright
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/opt-path.patch
 	use headless && epatch "${FILESDIR}"/headless.patch
@@ -131,8 +124,7 @@ src_install() {
 	doins -r etc
 
 	#install the changelog
-	insinto /usr/share/doc/${P}
-	doins usr/share/doc/spideroak/changelog.gz
+	dodoc usr/share/doc/spideroak/changelog.gz
 
 	if ! use headless ; then
 		domenu usr/share/applications/spideroak.desktop
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild
index b6ee9a76d3d3..57eeb108b5df 100644
--- a/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild,v 1.4 2013/03/02 19:12:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.7.9948.ebuild,v 1.5 2013/03/23 19:44:29 vapier Exp $
 
 EAPI="4"
 
-inherit eutils versionator
+inherit eutils versionator unpacker
 
 REV=$(get_version_component_range 3)
 SRC_URI_BASE="https://spideroak.com/directdownload?platform=ubuntulucid"
@@ -58,13 +58,6 @@ S=${WORKDIR}
 
 QA_PREBUILT="*"
 
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-	rm -f usr/share/doc/spideroak/copyright
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PF}-opt-path.patch
 	use headless && epatch "${FILESDIR}"/${PF}-headless.patch
@@ -141,8 +134,7 @@ src_install() {
 	doins -r etc
 
 	#install the changelog
-	insinto /usr/share/doc/${P}
-	doins usr/share/doc/spideroak/changelog.gz
+	dodoc usr/share/doc/spideroak/changelog.gz
 
 	if ! use headless ; then
 		domenu usr/share/applications/spideroak.desktop
diff --git a/app-backup/spideroak-bin/spideroak-bin-4.8.3-r1.ebuild b/app-backup/spideroak-bin/spideroak-bin-4.8.3-r1.ebuild
index d8d2d28c69f3..5c6d53db63d1 100644
--- a/app-backup/spideroak-bin/spideroak-bin-4.8.3-r1.ebuild
+++ b/app-backup/spideroak-bin/spideroak-bin-4.8.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.8.3-r1.ebuild,v 1.1 2013/01/24 04:31:50 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/spideroak-bin/spideroak-bin-4.8.3-r1.ebuild,v 1.2 2013/03/23 19:44:29 vapier Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils unpacker
 
 SRC_URI_BASE="https://spideroak.com/getbuild?platform=ubuntu"
 
@@ -41,13 +41,6 @@ S=${WORKDIR}
 
 QA_PREBUILT="*"
 
-src_unpack() {
-	unpack ${A}
-	unpack ./data.tar.gz
-	rm -f control.tar.gz data.tar.gz debian-binary
-	rm -f usr/share/doc/spideroak/copyright
-}
-
 src_prepare() {
 	use headless && epatch "${FILESDIR}"/${PF}-headless.patch