Move to new unpacker eclass for unpack_makeself.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

24 files changed, 86 insertions, 139 deletions

diff --git a/app-emulation/crossover-office-bin/ChangeLog b/app-emulation/crossover-office-bin/ChangeLog
index 17b6767831d0..11a67363f3a8 100644
--- a/app-emulation/crossover-office-bin/ChangeLog
+++ b/app-emulation/crossover-office-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/crossover-office-bin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/ChangeLog,v 1.17 2009/07/07 23:02:56 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/ChangeLog,v 1.18 2012/02/05 05:27:28 vapier Exp $
+
+  05 Feb 2012; Mike Frysinger <vapier@gentoo.org>
+  crossover-office-bin-6.0.0.ebuild, crossover-office-bin-6.0.1.ebuild,
+  crossover-office-bin-6.1.0.ebuild, crossover-office-bin-6.2.0.ebuild:
+  Move to new unpacker eclass for unpack_makeself.
 
   07 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   crossover-office-bin-6.2.0.ebuild:
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
index 71dcfee6ec3d..f3bbd8d45661 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild,v 1.4 2009/03/05 08:38:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild,v 1.5 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
index a102ccfcc9d3..d456314c6a1d 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild,v 1.4 2009/03/05 08:38:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild,v 1.5 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
index 7f7a312a9560..7724b63650c9 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild,v 1.3 2009/03/05 08:38:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild,v 1.4 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
index ce417e0e5ad7..a006ccfde4ca 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild,v 1.4 2009/07/07 23:02:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild,v 1.5 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	elog "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/ChangeLog b/app-emulation/crossover-office-pro-bin/ChangeLog
index c28869ac0610..1e697d6d08e0 100644
--- a/app-emulation/crossover-office-pro-bin/ChangeLog
+++ b/app-emulation/crossover-office-pro-bin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/crossover-office-pro-bin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/ChangeLog,v 1.21 2011/09/17 20:37:57 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/ChangeLog,v 1.22 2012/02/05 05:27:28 vapier Exp $
+
+  05 Feb 2012; Mike Frysinger <vapier@gentoo.org>
+  crossover-office-pro-bin-4.2.ebuild, crossover-office-pro-bin-5.0.0.ebuild,
+  crossover-office-pro-bin-5.0.1.ebuild, crossover-office-pro-bin-5.0.3.ebuild,
+  crossover-office-pro-bin-6.0.0.ebuild, crossover-office-pro-bin-6.1.0.ebuild,
+  crossover-office-pro-bin-6.2.0.ebuild, crossover-office-pro-bin-7.0.2.ebuild,
+  crossover-office-pro-bin-7.1.0.ebuild, crossover-office-pro-bin-8.0.0.ebuild,
+  crossover-office-pro-bin-9.0.0.ebuild, crossover-office-pro-bin-9.0.1.ebuild,
+  crossover-office-pro-bin-9.1.0.ebuild, crossover-office-pro-bin-9.2.0.ebuild:
+  Move to new unpacker eclass for unpack_makeself.
 
   17 Sep 2011; Mike Frysinger <vapier@gentoo.org>
   crossover-office-pro-bin-9.1.0.ebuild, crossover-office-pro-bin-9.2.0.ebuild:
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild
index b5e6af1d76f7..58ede87374bd 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild,v 1.10 2007/12/27 21:30:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-4.2.ebuild,v 1.11 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -36,10 +36,6 @@ pkg_setup() {
 		&& die "you need to have perl built with USE=ithreads"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
index 1af94686b418..02750f87fb5e 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild,v 1.9 2007/12/27 21:30:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild,v 1.10 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
index 749c51e2b25f..8eabfe9ecbbe 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild,v 1.7 2007/12/27 21:30:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild,v 1.8 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
index 007adfa210c6..42a29263ff5c 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild,v 1.5 2007/12/27 21:30:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild,v 1.6 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild
index 7d50ed3da8d4..f849927cf11b 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild,v 1.5 2007/12/27 21:30:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild,v 1.6 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
index ccb4d77994fe..53ac6c473d9c 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild,v 1.2 2007/12/27 21:30:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild,v 1.3 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
index 1357d86c18b9..0476b0633779 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild,v 1.2 2007/12/27 21:30:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild,v 1.3 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
index 66bf8bb270be..71d0c070feeb 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild,v 1.1 2009/08/23 10:53:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild,v 1.2 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
index 71e7442268a2..941f6b939b1b 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild,v 1.1 2009/08/23 10:53:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild,v 1.2 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild
index b04794a52179..f5da0baa3922 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild,v 1.1 2009/08/23 10:53:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild,v 1.2 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild
index c707c243fcbf..4f46d086a8c8 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild,v 1.1 2010/04/20 07:51:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild,v 1.2 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
index 18069ae32872..ac8ecf2547d4 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild,v 1.1 2010/04/30 13:17:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild,v 1.2 2012/02/05 05:27:28 vapier Exp $
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -31,10 +31,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
index 3bf60df1d222..43140f13dd93 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild,v 1.3 2011/09/17 20:37:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild,v 1.4 2012/02/05 05:27:28 vapier Exp $
 
 EAPI="3"
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -35,10 +35,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
index a620113014e1..9fb44d284d04 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild,v 1.2 2011/09/17 20:37:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild,v 1.3 2012/02/05 05:27:28 vapier Exp $
 
 EAPI="3"
 
-inherit eutils
+inherit unpacker
 
 DESCRIPTION="simplified/streamlined version of wine with commercial support"
 HOMEPAGE="http://www.codeweavers.com/products/cxoffice/"
@@ -35,10 +35,6 @@ pkg_nofetch() {
 	einfo "and place ${A} in ${DISTDIR}"
 }
 
-src_unpack() {
-	unpack_makeself
-}
-
 src_install() {
 	dodir /opt/cxoffice
 	cp -r * "${D}"/opt/cxoffice || die "cp failed"
diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 19df10338b03..773e90467a04 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.123 2012/01/09 21:42:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.124 2012/02/05 05:25:37 vapier Exp $
+
+  05 Feb 2012; Mike Frysinger <vapier@gentoo.org> virtualbox-bin-4.1.4.ebuild,
+  virtualbox-bin-4.1.6-r1.ebuild, virtualbox-bin-4.1.8.ebuild:
+  Move to new unpacker eclass for unpack_makeself.
 
   09 Jan 2012; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-bin-4.1.8.ebuild:
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
index 09c22b174279..2c554ff89a7c 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild,v 1.3 2011/12/07 17:27:51 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.4.ebuild,v 1.4 2012/02/05 05:25:37 vapier Exp $
 
 EAPI=2
 
-inherit eutils fdo-mime pax-utils
+inherit eutils unpacker fdo-mime pax-utils
 
 MY_PV=${PV}-74291
 SDK_PV=${MY_PV}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild
index 8aca0a902852..bae0e209a78d 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild,v 1.1 2011/11/06 23:39:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.6-r1.ebuild,v 1.2 2012/02/05 05:25:37 vapier Exp $
 
 EAPI=2
 
-inherit eutils fdo-mime pax-utils
+inherit eutils unpacker fdo-mime pax-utils
 
 MY_PV=${PV}-74727
 SDK_PV=${PV}-74713
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild
index 2b2d63fd5912..303dd3726e3d 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild,v 1.2 2012/01/09 21:42:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.1.8.ebuild,v 1.3 2012/02/05 05:25:37 vapier Exp $
 
 EAPI=2
 
-inherit eutils fdo-mime gnome2 pax-utils
+inherit eutils unpacker fdo-mime gnome2 pax-utils
 
 MY_PV=${PV}-75467
 SDK_PV=${MY_PV}