EAPI 3 was merged into master, remove USE=eapi3-draft

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 14 insertions, 20 deletions

diff --git a/app-doc/pms/ChangeLog b/app-doc/pms/ChangeLog
index bd6c9a8f581e..6dbe90291d1a 100644
--- a/app-doc/pms/ChangeLog
+++ b/app-doc/pms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-doc/pms
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/ChangeLog,v 1.17 2009/04/23 18:43:12 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/ChangeLog,v 1.18 2009/05/31 19:03:19 gentoofan23 Exp $
+
+  31 May 2009; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml,
+  pms-99999999.ebuild:
+  EAPI 3 was merged into master, remove USE=eapi3-draft
 
   23 Apr 2009; Mounir Lamouri <volkmar@gentoo.org> pms-2.ebuild,
   pms-99999999.ebuild:
diff --git a/app-doc/pms/Manifest b/app-doc/pms/Manifest
index 13d11ace3fa4..ff8bd55ba311 100644
--- a/app-doc/pms/Manifest
+++ b/app-doc/pms/Manifest
@@ -1,5 +1,6 @@
 DIST pms-2.pdf 326300 RMD160 eed4628ac9bda450a32315019354bf7eb4de165a SHA1 a4a7b58557f1ed30f6f4f6840f874893d43b7757 SHA256 e012b3fa290a65f9912f9279190af6b564baa22c68362b5cbf79f6f480041f2a
 EBUILD pms-2.ebuild 611 RMD160 f6c241bd15b07acbe017fd3fc1726fa067c2377b SHA1 2a641336922dec2151ae3808ace7fdc849ccbbae SHA256 fd49ba66a2dce7c9489333aef054a8c932decad65b934d9582a3f0175f5c2814
-EBUILD pms-99999999.ebuild 1578 RMD160 7b834dd341488f9c7d5ac193aeca40c16a214571 SHA1 eef67993e67f8bb69f45ba10004de329245c78d5 SHA256 dfd52ac387bab78418df16ed82520bcda619df4d4184b42eb4fb27212a88762c
-MISC ChangeLog 2551 RMD160 0dbbda4b61c02af5f7abc5941bbcec2038fa97ee SHA1 28d5feeaa9cb5275bf3522630ce277b058f3a7c9 SHA256 3a1707f6dc2ab1868a1d1dbf9617a435215e7c02dc019f78d1d1fa90e19333e7
-MISC metadata.xml 873 RMD160 62d77b283084af5333a283df946fe29a43010d38 SHA1 f6294fee03a263c9cad4045ac5833cff4dc72a68 SHA256 ec78971be206a6914d7a11b3bf6e3bd005ff7f681a7967786a719315647888b5
+EBUILD pms-99999999.ebuild 1340 RMD160 1f06ce0f926e4bcdf2ae13787e226a8e6088b22d SHA1 1f101ea72d3315aed29de515494b0574b53ef995 SHA256 15feacbe6cbf5c39ac430d9feab5894086b846e6411774d8f473916314299515
+MISC ChangeLog 2705 RMD160 f5f6f992c4b83ca46aaf3568a05e0fb9bb99aa3c SHA1 4cc126a12807b576dcfd1348f5a68fea7e114d6c SHA256 0d70dda78eab34c2f3905ceb5f4c2f2ed525d527a71d70f149a4030184b2b318
+MISC metadata.xml 784 RMD160 dd4d54930e1c13a75ae6dff0ddb718049bfc32e6 SHA1 7242681d9ea5d205751fb17991e11e3c7f681038 SHA256 0ff0a68b221248f18d327097a9284a1e74c0a455eaf3156238e70bbb00a3bcc6
+MISC pms-99999999.ebuild.orig 1578 RMD160 7b834dd341488f9c7d5ac193aeca40c16a214571 SHA1 eef67993e67f8bb69f45ba10004de329245c78d5 SHA256 dfd52ac387bab78418df16ed82520bcda619df4d4184b42eb4fb27212a88762c
diff --git a/app-doc/pms/metadata.xml b/app-doc/pms/metadata.xml
index 4460533c676d..6f0b6a361348 100644
--- a/app-doc/pms/metadata.xml
+++ b/app-doc/pms/metadata.xml
@@ -17,8 +17,6 @@
 	<use>
 		<flag name="all-options">Include both sides of kdebuild conditionals,
 			shown in different colours (PDF only)</flag>
-		<flag name="eapi3-draft">Include work-in-progress draft EAPI 3
-		specification.</flag>
 		<flag name="html">Generate PMS as .html as well</flag>
 		<flag name="kdebuild">Include specification for the kdebuild EAPI, see
 		http://www.gentoo.org/proj/en/desktop/kde/kdebuild-1.xml</flag>
diff --git a/app-doc/pms/pms-99999999.ebuild b/app-doc/pms/pms-99999999.ebuild
index b823843bfa83..9d209efd556c 100644
--- a/app-doc/pms/pms-99999999.ebuild
+++ b/app-doc/pms/pms-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/pms-99999999.ebuild,v 1.11 2009/04/23 18:43:12 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/pms/pms-99999999.ebuild,v 1.12 2009/05/31 19:03:19 gentoofan23 Exp $
 
 inherit git
 
@@ -13,30 +13,21 @@ SRC_URI=""
 LICENSE="CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="all-options eapi3-draft html kdebuild"
+IUSE="all-options html kdebuild"
 
 DEPEND="html? ( >=dev-tex/tex4ht-20090115_p0029 )
-	eapi3-draft? ( dev-texlive/texlive-bibtexextra dev-tex/leaflet )
+	dev-tex/leaflet
+	dev-texlive/texlive-bibtexextra
 	dev-texlive/texlive-latex
 	dev-texlive/texlive-latexrecommended
 	dev-texlive/texlive-latexextra
 	dev-texlive/texlive-science"
 RDEPEND=""
 
-src_unpack() {
-	if use eapi3-draft; then
-		EGIT_REPO_URI="git://github.com/ciaranm/pms.git"
-		EGIT_BRANCH="eapi-3"
-		EGIT_TREE="${EGIT_BRANCH}"
-	fi
-	git_src_unpack
-}
-
 set_conditional() {
 	local boolname=ENABLE-$(tr '[[:lower:]]' '[[:upper:]]' <<<${1})
 	local boolval=$(use ${1} && echo true || echo false)
-	sed -i -e '/\\setboolean{'${boolname}'}/s/true\|false/'${boolval}'/' \
-		$(use eapi3-draft && echo pms.cls || echo pms.tex) || die "sed failed"
+	sed -i -e '/\\setboolean{'${boolname}'}/s/true\|false/'${boolval}'/' pms.cls || die "sed failed"
 }
 
 src_compile() {