diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-10-16 20:21:16 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-10-16 20:21:16 +0000 |
commit | 5c0296dae981c3267d27332337cc661bd1fe5b5a (patch) | |
tree | e08d94d0f2c9557e790f31fbc760dfc9fe613936 | |
parent | Respect LDFLAGS. Bug #334625 (diff) | |
download | historical-5c0296dae981c3267d27332337cc661bd1fe5b5a.tar.gz historical-5c0296dae981c3267d27332337cc661bd1fe5b5a.tar.bz2 historical-5c0296dae981c3267d27332337cc661bd1fe5b5a.zip |
Add some calls to die().
Package-Manager: portage-2.2_rc97_p1/cvs/Linux x86_64
-rw-r--r-- | dev-python/python-ldap/Manifest | 4 | ||||
-rw-r--r-- | dev-python/python-ldap/python-ldap-2.3.12.ebuild | 9 | ||||
-rw-r--r-- | dev-python/python-ldap/python-ldap-2.3.9.ebuild | 15 |
3 files changed, 17 insertions, 11 deletions
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest index d60a9226a327..c5f10ca55bc4 100644 --- a/dev-python/python-ldap/Manifest +++ b/dev-python/python-ldap/Manifest @@ -4,7 +4,7 @@ DIST python-ldap-2.3.9.tar.gz 108209 RMD160 25d8555f548acdb418725f966f9ee94730f4 DIST python-ldap-docs-html-2.3.11.tar.gz 84078 RMD160 917b44c7f1f9f7b38f8c41b164fd5bf35a096952 SHA1 79f8c7f8d4ed1a9a64c8dbd7a07caef6288a3b6d SHA256 b62d9d59cabb3ee4bf3e247a692310e69cf7780e4333888d7e5a21af5c56a312 DIST python-ldap-docs-html-2.3.7.tar.gz 90650 RMD160 51a08f7008e36c360007f271a2e93de1b3f1adfa SHA1 246bcd4c164aa7f8cde9caae82d1a72fee5504ab SHA256 0e15675025504904cdbc2c5b23deba9149ab8b199b31cf7d532db57e4ef09102 EBUILD python-ldap-2.3.11.ebuild 1953 RMD160 14f9f0801ed6299a6ec43408213a621bf0e5a6a4 SHA1 161b48f256126073115f474f3a4dbbc9be79fb7c SHA256 9a8ec57485f88e6fffa1677bf51432844aa13f787fa8a08f58e1149b7bffeed7 -EBUILD python-ldap-2.3.12.ebuild 1954 RMD160 5f5c55bb3122df676af60bf77838501cc9cc16cc SHA1 0cc0b7ebb436e0e97df292e868176d7c18a55ec7 SHA256 6eee70cab2d61caf68e77c7e5e40342772432f612c5b8ec42e4b55efebebf356 -EBUILD python-ldap-2.3.9.ebuild 1810 RMD160 e4555ca4ebbd8ce1b688beb466b752fa90ad4b05 SHA1 8b51fa4444397a9d081102addafe9ebc93bb4577 SHA256 eda3b690e2eeeb47c0373d9455dd6e067a711b3fd9180b7d0ad164c0a83f18c7 +EBUILD python-ldap-2.3.12.ebuild 2012 RMD160 5a73ea0919c73f01b5e72f63e08d158540b20894 SHA1 54cf0940dfb39d4826a30e9690a1cb4c99a93329 SHA256 5f260d9976389ea83ed3f34e8c45ddc85081095a3d431dbe39e531ce1a159d30 +EBUILD python-ldap-2.3.9.ebuild 1861 RMD160 ca25dc2ba1e828a4d0b63c0f8773ca3a328a0f64 SHA1 8c3101c54014df37d8516f6f50dd0e7b68c92ccd SHA256 f554bf5dbae01b6e59216db6830fff15e3cf8173b3bd2eff0c04871d11285793 MISC ChangeLog 10964 RMD160 b9f7a9970e29ca9f72870eda71136e2558ce1a9f SHA1 2463604138ac8d64230ba6bd99ba8ae6c561f1f8 SHA256 b0e92af35366156e956a18517ba266030cd985eb2d0af47cddd4ad806e1b0e63 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 diff --git a/dev-python/python-ldap/python-ldap-2.3.12.ebuild b/dev-python/python-ldap/python-ldap-2.3.12.ebuild index 31057267b7d5..7e350444113b 100644 --- a/dev-python/python-ldap/python-ldap-2.3.12.ebuild +++ b/dev-python/python-ldap/python-ldap-2.3.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.12.ebuild,v 1.1 2010/09/15 20:30:02 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.12.ebuild,v 1.2 2010/10/16 20:21:16 arfrever Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -55,9 +55,12 @@ src_prepare() { src_install() { distutils_src_install - use doc && dohtml -r "${WORKDIR}/${DOC_P}"/* + if use doc; then + dohtml -r "${WORKDIR}/${DOC_P}"/* || die "dohtml failed" + fi + if use examples; then insinto /usr/share/doc/${PF} - doins -r Demo + doins -r Demo || die "doins failed" fi } diff --git a/dev-python/python-ldap/python-ldap-2.3.9.ebuild b/dev-python/python-ldap/python-ldap-2.3.9.ebuild index edfceeeb9e1e..71b904485f96 100644 --- a/dev-python/python-ldap/python-ldap-2.3.9.ebuild +++ b/dev-python/python-ldap/python-ldap-2.3.9.ebuild @@ -1,12 +1,13 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.9.ebuild,v 1.12 2010/09/15 19:56:40 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.3.9.ebuild,v 1.13 2010/10/16 20:21:16 arfrever Exp $ -EAPI="2" +EAPI="3" PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" -inherit distutils eutils multilib +inherit distutils multilib DOC_P="${PN}-docs-html-2.3.7" @@ -24,7 +25,6 @@ RDEPEND=">=net-nds/openldap-2.3 sasl? ( dev-libs/cyrus-sasl )" DEPEND="${DEPEND} dev-python/setuptools" -RESTRICT_PYTHON_ABIS="3.*" DOCS="CHANGES README" PYTHON_MODNAME="dsml.py ldapurl.py ldif.py ldap" @@ -52,9 +52,12 @@ src_prepare() { src_install() { distutils_src_install - use doc && dohtml -r "${WORKDIR}/${DOC_P}"/* + if use doc; then + dohtml -r "${WORKDIR}/${DOC_P}"/* || die "dohtml failed" + fi + if use examples; then insinto /usr/share/doc/${PF} - doins -r Demo + doins -r Demo || die "doins failed" fi } |