Version bump to 1.0. Add doc USE flag.

(Portage version: 2.1.4.4)

5 files changed, 23 insertions, 110 deletions

diff --git a/dev-python/formencode/ChangeLog b/dev-python/formencode/ChangeLog
index d11eb96d6a61..2f2cd6f12bee 100644
--- a/dev-python/formencode/ChangeLog
+++ b/dev-python/formencode/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/formencode
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/ChangeLog,v 1.13 2007/10/01 17:16:22 hawking Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/ChangeLog,v 1.14 2008/03/23 15:13:17 chtekk Exp $
+
+*formencode-1.0 (23 Mar 2008)
+
+  23 Mar 2008; Luca Longinotti <chtekk@gentoo.org>
+  -files/formencode-0.7.1-verify_domain.patch, -formencode-0.7-r1.ebuild,
+  -formencode-0.7.1-r1.ebuild, -formencode-0.7.1-r2.ebuild,
+  +formencode-1.0.ebuild:
+  Version bump to 1.0. Add doc USE flag to control installation of
+  additional docs.
 
 *formencode-0.7.1-r2 (01 Oct 2007)
 
diff --git a/dev-python/formencode/files/formencode-0.7.1-verify_domain.patch b/dev-python/formencode/files/formencode-0.7.1-verify_domain.patch
deleted file mode 100644
index 08e2f36a34a7..000000000000
--- a/dev-python/formencode/files/formencode-0.7.1-verify_domain.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- formencode/validators.py	2007-04-01 00:06:43.000000000 +0300
-+++ formencode/validators.py	2007-10-01 19:30:53.000000000 +0300
-@@ -1230,8 +1230,10 @@
-         if self.resolve_domain:
-             assert have_dns, "pyDNS should be available"
- 	    try:
--                a=DNS.DnsRequest(domain).req().answers
--                dnsdomains=[x['data'] for x in a if x['typename'] in ('A', 'MX')]
-+                a=DNS.DnsRequest(domain, qtype='mx').req().answers
-+                if not a:
-+                    a=DNS.DnsRequest(domain, qtype='a').req().answers
-+                dnsdomains=[x['data'] for x in a]
- 	    except (socket.error, DNS.DNSError), e:
- 		raise Invalid(
- 		    self.message('socketError', state, error=e),
diff --git a/dev-python/formencode/formencode-0.7.1-r1.ebuild b/dev-python/formencode/formencode-0.7.1-r1.ebuild
deleted file mode 100644
index a71a566ab9c7..000000000000
--- a/dev-python/formencode/formencode-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/formencode-0.7.1-r1.ebuild,v 1.1 2007/07/04 17:50:20 pythonhead Exp $
-
-# TODO: Add pudge support via "doc" flag
-#       currently broken with 0.6 and 0.7 releases
-
-NEED_PYTHON=2.3
-
-inherit distutils
-
-MY_PN="FormEncode"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="HTML form validation, generation, and conversion package"
-HOMEPAGE="http://formencode.org"
-SRC_URI="http://cheeseshop.python.org/packages/source/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools"
-
-PYTHON_MODNAME=$MY_PN
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	distutils_src_install
-
-	dodoc docs/*.txt
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
diff --git a/dev-python/formencode/formencode-0.7.1-r2.ebuild b/dev-python/formencode/formencode-0.7.1-r2.ebuild
deleted file mode 100644
index a4846fcc9c92..000000000000
--- a/dev-python/formencode/formencode-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/formencode-0.7.1-r2.ebuild,v 1.1 2007/10/01 17:16:22 hawking Exp $
-
-# TODO: Add pudge support via "doc" flag
-#       currently broken with 0.6 and 0.7 releases
-
-NEED_PYTHON=2.3
-
-inherit distutils eutils
-
-MY_PN="FormEncode"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="HTML form validation, generation, and conversion package"
-HOMEPAGE="http://formencode.org"
-SRC_URI="http://cheeseshop.python.org/packages/source/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2.4"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools"
-
-PYTHON_MODNAME=$MY_PN
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	distutils_src_unpack
-
-	# fix domain verification. bug 194093
-	epatch "${FILESDIR}/${P}-verify_domain.patch"
-}
-
-src_install() {
-	distutils_src_install
-
-	dodoc docs/*.txt
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
diff --git a/dev-python/formencode/formencode-0.7-r1.ebuild b/dev-python/formencode/formencode-1.0.ebuild
index bdc039265f56..06145f900b8f 100644
--- a/dev-python/formencode/formencode-0.7-r1.ebuild
+++ b/dev-python/formencode/formencode-1.0.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/formencode-0.7-r1.ebuild,v 1.1 2007/07/04 17:50:20 pythonhead Exp $
-
-# TODO: Add pudge support via "doc" flag
-#       currently broken with 0.6 and 0.7 releases
+# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/formencode-1.0.ebuild,v 1.1 2008/03/23 15:13:17 chtekk Exp $
 
 NEED_PYTHON=2.3
 
@@ -12,25 +9,26 @@ inherit distutils
 MY_PN="FormEncode"
 MY_P="${MY_PN}-${PV}"
 
-DESCRIPTION="HTML form validation, generation, and conversion package"
-HOMEPAGE="http://formencode.org"
+DESCRIPTION="HTML form validation, generation and conversion package."
+HOMEPAGE="http://formencode.org/"
 SRC_URI="http://cheeseshop.python.org/packages/source/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
 LICENSE="PSF-2.4"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
+IUSE="doc"
 
-RDEPEND="dev-python/setuptools"
+DEPEND="dev-python/setuptools"
 
-PYTHON_MODNAME=$MY_PN
 S="${WORKDIR}/${MY_P}"
 
 src_install() {
 	distutils_src_install
 
-	dodoc docs/*.txt
+	if use doc ; then
+		cd "${S}"
+		dodoc docs/*.txt
 
-	insinto /usr/share/doc/${PF}
-	doins -r examples
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
 }