Updating live ebuild to use git-2 eclass

Package-Manager: portage-2.1.9.49/cvs/Linux i686

4 files changed, 22 insertions, 27 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 9818d4e6897b..26bcad657204 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.289 2011/07/13 00:45:45 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.290 2011/07/14 03:05:22 lack Exp $
+
+  14 Jul 2011; Jim Ramsay <lack@gentoo.org> fluxbox-9999.ebuild:
+  Updating live ebuild to use git-2 eclass
 
   13 Jul 2011; Jim Ramsay <lack@gentoo.org> -fluxbox-1.0.0.ebuild,
   -fluxbox-1.0.0-r2.ebuild, -fluxbox-1.1.0.1.ebuild, -fluxbox-1.1.1-r1.ebuild,
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index c2f6718b948b..f1b96c91dac3 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -24,23 +24,23 @@ DIST fluxbox-1.1.1.tar.bz2 777660 RMD160 aabfdd10c835d0ef903885646a7f34f7df75af1
 DIST fluxbox-1.3.1.tar.bz2 799235 RMD160 529d2f23d9446b3e76f3974e14c8b9459d788ecb SHA1 1c4755b8ac1042c98f700848240ac99ef18dca01 SHA256 c47b2615608151dd19bf9d738badb30ea4179dbe4edeb2243a269a9bb932628c
 EBUILD fluxbox-1.1.1-r3.ebuild 3863 RMD160 3bf900d98dc13bb4e087a2d2db5dad329c1c7ecf SHA1 df92afa33f7c1c84eae9aae67617c8b52b19b34c SHA256 d5196b53c400d0b2c7d3241e09f17ae6024896606a5a9012ba0adacc9ea8b5e1
 EBUILD fluxbox-1.3.1.ebuild 3227 RMD160 b10af7ca509dfbeec2b6107f0177b8247e45bd31 SHA1 2e010bd41bf073408f6d14552ae94c14efb83ad8 SHA256 16a25fad1a1cbcb44e1d732586f9bcd49185cf46843cfca4133e59d831da8c5a
-EBUILD fluxbox-9999.ebuild 3200 RMD160 bdd0648609c006790b93b929e56e139cbbe1a493 SHA1 5ed2e93e753aace66b7e318d44926b21455f1451 SHA256 245a0c68232465e20a112df3467d93aa36234cec38bf0171d335f738f649b5c6
-MISC ChangeLog 53434 RMD160 fd6e11f87a6445ac02fe8ec5ed4c17b52a1ba863 SHA1 bbe901c98195964ec06d7d2c355339f50a5d54a8 SHA256 5c620d3bd53778037635f8aa869c0dc0235859da3ceff7c7c5249007094089b1
-MISC metadata.xml 1124 RMD160 ade07b2ec508cf3be2e6d439c5e6b3d7e94fe792 SHA1 ce24cca05659fcfa1fcdd5697082d87e8d9c501d SHA256 4a4c6e8e71d6d258fd9af8843f5eaa0c3d90f004f21121123e58abedba060e95
+EBUILD fluxbox-9999.ebuild 3141 RMD160 ddccbc8cb55d417b5861132ba465da966a37481c SHA1 8350c530538ae0f96756b271e6c7c722f619020a SHA256 43e1b5a32f2286277d43e60a5888c7f3617061b51db659c71ebed77c2c449853
+MISC ChangeLog 53543 RMD160 63170372daaaab155a6e86cc221ee90479337644 SHA1 df6d9d4dda61a0a3f92c9c26770deed4227c4165 SHA256 f221e99799b1606e5bcf8e592a51e5f0b5e6e921dd2ec6e8ec12c9cabaef0479
+MISC metadata.xml 988 RMD160 0253bdcc0ce18a493f7365905f78af4775ae71ad SHA1 bc77bef49bdb06a5f5aca2d604022a35381c51d0 SHA256 cb33cb06c573bda189a04cbb6e6e8c792cf59f8ad3267ee55c2e73dd651e93c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIbBAEBCAAGBQJOHOq/AAoJEA8o5SF9Rr6qKJoP+KkunXAuPbJYoKVTPcS/Ay1h
-RBtlqXcsnvk4LnGkRK/a0auaEBuGB0+RvyHcQCiq8GThpLM2gD/uIlwrd1T+nUsC
-R3E7i03dn2cHGOyJn26qV3tUXKxdRg5TORBwfO25wqfQP8Lhmb3C4kZC+RVLMjgq
-HCW/jOFUMDN19Xaz7k/+HqHnxAxinoSoiueu8QnYUBObw/WCPHLBs2M1Q8TGEXjA
-m4vaRWUEIRJxrkEnxE/KsA4bDo3w5VZeiNLRLZitMDGMgDbKJphwLWJIETQnX5ek
-IL3jyL3A/pz2ht/YwgcxgH9vM6e6uwAXhggczNNNRoaUaZbwWuS3sPGRHdMCAXwg
-lMsUpaTWRiscPLA8cPwERT5HBnmyULts3PiJ5+yjPcpCrQV321YyTCGbwNBSRDgF
-NJF1oyRNQ2slkVU/rz16lgCDqli7+esb4mlJRbm1AvCZYEC/5XQdgA98YmovSWPe
-FssO2dptIwJ+9Sf0nJWN0hBZB2yHUt0pfbLgjNqDsFRpvG+qs/bcsagDTu+vkYkR
-pIUJThRXtsJL4Qso867CFe3uPZ2VLCfy9YdyFDfpnQQ86J6YAu2gVICte0Bv0/Jx
-bS8Y3dr7HdZQ5IwonjP+3S/qeefmTckgCCFaXOxr7ZjavonfH++bs8PSc8/YGtyM
-OjbhKPywpMXvwBztY3c=
-=+fuy
+iQIcBAEBCAAGBQJOHl0JAAoJEA8o5SF9Rr6q2csQAI9u/KT+PpOEGpwvU2KqZJw6
+rem4WYa6w034qhbRJVsE9tcVDSgYI2eVH5jvvlLG40cZ/Qx2nQXatNTGF24fwrZy
+pw9nbmsrXXjgSbdEthpdWBZ3dRgL2ZDN58oWUXcf+cgc0CUf8wEOYF++7i7xgSC4
+YJp/6tVs67tEMPSppSVr48JR4C4mq22IX6TFzT8K6YZ7VhofBCP9f9tMsKRgG7ue
+MtSiVRvEWagSJH67Qphi5zrkQ6Ob0RPFV3ftVTygDkbS1J3/S19CNMO5J9YWzzLP
+r3upjns1mx309BcCg0eX7fUWbIIrwGCASio4F9KawC+/hLV2NMC1r4a5NxQffbMy
+CSX5QQlN13a+IfK6XtG+pcZKGX4RhEy0/2AT+qx6iGdrBbPQ38vdybQMcU3gaub0
+4oudxfOMlbJpcMWoGyumQilp04IHUefdO0F+/5IINGolAhHkPDSNo5HJ9fZGemRu
+UiC909SnWuCsrSy3Pvyt6x+XLXwsJvJbT7Waz5v7tjZavXP6gs/UaJt6Wj7Ll9cD
+RvkFiGY+Pk8LlJOtQPb4+KnQQ9XTOFUjWUckFFKjHb7j94bB4nZO3C0F2TyGNgLK
+BVjkFJgj4rOSvEofx52U+hEP2RtFMXhB3VtMo7tGcIy38B0+Gmp3bb0ueU6h5ksJ
+t/3TlxABC7sunmeSiwRI
+=7sZh
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
index b16e53deab9d..c4d9ce2e39f6 100644
--- a/x11-wm/fluxbox/fluxbox-9999.ebuild
+++ b/x11-wm/fluxbox/fluxbox-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.8 2011/04/16 18:22:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.9 2011/07/14 03:05:22 lack Exp $
 
 EAPI=3
-inherit eutils git prefix
+inherit eutils git-2 prefix
 
 IUSE="nls xinerama bidi +truetype gnome +imlib +slit +toolbar vim-syntax"
 
@@ -39,13 +39,7 @@ SLOT="0"
 LICENSE="MIT"
 KEYWORDS=""
 
-src_unpack() {
-	git_src_unpack
-}
-
 src_prepare() {
-	git_src_prepare
-	cd "${S}"
 	./autogen.sh
 
 	# We need to be able to include directories rather than just plain
diff --git a/x11-wm/fluxbox/metadata.xml b/x11-wm/fluxbox/metadata.xml
index d13e0128c6da..0bc62a0af3f1 100644
--- a/x11-wm/fluxbox/metadata.xml
+++ b/x11-wm/fluxbox/metadata.xml
@@ -14,8 +14,6 @@
 		additonal features.
 		]]></longdescription>
 	<use>
-		<flag name='disableslit'>Disables the fluxbox slit (or dock)</flag>
-		<flag name='disabletoolbar'>Disables the fluxbox toolbar</flag>
 		<flag name='slit'>Enables the fluxbox slit (or dock)</flag>
 		<flag name='toolbar'>Enables the fluxbox toolbar</flag>
 		<flag name='newmousefocus'>Patches the focus model to the upcoming 1.1.2