From: Zac Medico Date: Tue, 23 Feb 2010 10:41:05 +0000 (+0000) Subject: Bug #282760 - Add a workaround for unicode issues with the pysqlite module that cause... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ce8c46ae716a79acc7210959ebaf909ad3135da;p=gentoo.git Bug #282760 - Add a workaround for unicode issues with the pysqlite module that cause epydoc to fail. Package-Manager: portage-2.2_rc63_p15426/cvs/Linux i686 --- diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog index 2161b249b199..7fee8315cf9f 100644 --- a/sys-apps/portage/ChangeLog +++ b/sys-apps/portage/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/portage # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.677 2010/02/20 09:49:06 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.678 2010/02/23 10:41:05 zmedico Exp $ + + 23 Feb 2010; Zac Medico portage-2.1.6.7.ebuild, + portage-2.1.7.16.ebuild, portage-2.1.7.17.ebuild, portage-2.2_rc62.ebuild, + portage-2.2_rc63.ebuild: + Bug #282760 - Add a workaround for unicode issues with the pysqlite module + that cause epydoc to fail. 19 Feb 2010; Zac Medico ChangeLog: Prune old ChangeLog entries. diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 208cbab06c76..a89ec6378d5b 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -13,17 +13,17 @@ DIST portage-2.2_rc62.patch.bz2 104266 RMD160 85f117fe7dc58cca4b1497b88cb8e755b9 DIST portage-2.2_rc63.patch.bz2 126681 RMD160 f64eb2484047f919ab58b4559f675258c9063170 SHA1 71b54aac7e5b46ca5307aab4e5e4e781aa225bee SHA256 8202353648ed018f5ade82544a5d6737cc05154b9870e347c7883e1077847cf3 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f EBUILD portage-2.1.6.13.ebuild 9775 RMD160 f25b88d518c4d1726761fe5b71a1a182dbba6837 SHA1 dbef2f6be78a1777215bc679fa0664b5fb244faa SHA256 cc6b6505057461b710ced2cd1abbfea3c409a66dd4d79be4f5226b379f471852 -EBUILD portage-2.1.6.7.ebuild 8427 RMD160 db2928d51c776268181db06c7304b1b10b868a6e SHA1 c9772b4f94224e92fec911e34058ae618cad7616 SHA256 e0713654ab4527ec0e023571ee831f53bf5763466022ae409e5e9358c4e3259d -EBUILD portage-2.1.7.16.ebuild 9981 RMD160 9bb8dadb116947375c2a61a3bff8b4188e689cd1 SHA1 deb49f5afd5b277ff2740e2c61841240e6894503 SHA256 8d75cbc078820e49f43c5e00fec82d0afef92f28577cda62481e8f5aa5b0f76d -EBUILD portage-2.1.7.17.ebuild 10050 RMD160 649e8b563807c97c627edcbac98a7e738f41e78c SHA1 b974dc7f8f75b1d37d0fa5f4ccd80da8df6e8c69 SHA256 b858fd1a93980fa4db30f1701b1fbe81f78f20ee143fa8366ab844da93459eb7 -EBUILD portage-2.2_rc62.ebuild 10963 RMD160 39c96d28bb0ec97329a55ae71c9d49b2c2f5c71f SHA1 0f1b69f184f281b119cdda863de7cc255cd5ea5e SHA256 add0181823d2ced4a75859152378c471f46955c3e2c4de6f60b02049e8903d53 -EBUILD portage-2.2_rc63.ebuild 10963 RMD160 4246a1ffb55e02044d7eab94011b676efe5aec27 SHA1 6bc76af45fac3ac2675dca19851cfe5afebb2d80 SHA256 ddc73b396488c1debe0bbe95529d5f898936f87ece7842ae0f71e889ff4a1241 -MISC ChangeLog 5316 RMD160 8490049b77cc87417fa5ab7deebd772fe3c08410 SHA1 d15a1f50edd01f4ab1ee6120411339fde6f7c0f5 SHA256 24c38f9226013d3a09b33021a14b7313f46dceed715508a89f1bcba0f3b24982 +EBUILD portage-2.1.6.7.ebuild 8510 RMD160 d8f9213fda0f2c17ba6bb1c1c5a6ed67c37d5cd1 SHA1 4f9a08a66c46d06be85b1d0c17093e3ff9995978 SHA256 4f88b84d0c815802a1d9e8f0e7350f8bf100150b478508869dcd20475ec765dc +EBUILD portage-2.1.7.16.ebuild 10064 RMD160 d9b39d6feb711e668c4ef285d531968821290890 SHA1 24048a8c51753747fe1a7be06c712f77df9d70cf SHA256 faf2a221cd70ac45367c9127f15bb71a4524537fc876bb77d001897d5c71fee9 +EBUILD portage-2.1.7.17.ebuild 10133 RMD160 c5b72296046d4c7d2a4c6e4ade257eac5e6aa7e2 SHA1 4526250c60db27d1aa3e7596ba5d5fafec604612 SHA256 32f81626ea8c592b3e0ebce45666778c728d1c5e4bb09f974970ede270fae3a6 +EBUILD portage-2.2_rc62.ebuild 11046 RMD160 9f093b14959b0c8f45ba8f0e0478d296a7ffc5a5 SHA1 b68099591f14cf208f3dd14934e7e5514048b898 SHA256 15d2d9980755987ef68ce5d51b2351cdf4a451e58e6720084cd1e10b84ba8265 +EBUILD portage-2.2_rc63.ebuild 11046 RMD160 a9e44f71eb76b04e4f35dda04d55bb6aa25bbb3c SHA1 aa04d0dc9ecde7d594800fbafd51e1659034a82a SHA256 4b629454053d16348e5eddd2a070ee89f769d167ad8ce73534f7b4f6aa247fee +MISC ChangeLog 5598 RMD160 737c6d7ec75e05c3a133812ede96420db2fc98ee SHA1 c1bea18a023b6717dd80ec6705e5fff2a032ae04 SHA256 dad0b1190e4487bd7d3a122cadac254b7002762e8cc7968bb011273cb489c500 MISC metadata.xml 436 RMD160 ac90cc20b6b1e04e386ee758372fa8d9261046ec SHA1 01ec015d6e3a341353400be991c61347fd1f9142 SHA256 cf021b3830c7b854696e5b46b5b802156555e2cd5618ff27826a6a2f8f57a1c0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkt/sHQACgkQ/ejvha5XGaPlBwCgr96BTudn4nJNMx0N1h0LR6zI -AOYAoLTfZe9h7KjoAYCpy+t5g6FKSApG -=p7dy +iEYEARECAAYFAkuDsRcACgkQ/ejvha5XGaOUmwCeMh6Tg+FGio6HVYb5vMmJKZl6 +lekAnRPhxUY4aIcbZY4vOA8rXJRh3IL2 +=Bsy7 -----END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.1.6.7.ebuild b/sys-apps/portage/portage-2.1.6.7.ebuild index 0a6e4f95004e..479ce79deca1 100644 --- a/sys-apps/portage/portage-2.1.6.7.ebuild +++ b/sys-apps/portage/portage-2.1.6.7.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/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.15 2010/02/10 01:04:03 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.6.7.ebuild,v 1.16 2010/02/23 10:41:05 zmedico Exp $ inherit eutils multilib python @@ -100,10 +100,13 @@ src_compile() { my_modules="$(find "${S}/pym" -name "*.py" \ | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ -e 's:/:.:g' | sort)" || die "error listing modules" + # workaround for bug 282760 + > "$S/pym/pysqlite2.py" PYTHONPATH="${S}/pym:${PYTHONPATH}" epydoc -o "${WORKDIR}"/api \ -qqqqq --no-frames --show-imports $epydoc_opts \ --name "${PN}" --url "${HOMEPAGE}" \ ${my_modules} || die "epydoc failed" + rm "$S/pym/pysqlite2.py" fi } diff --git a/sys-apps/portage/portage-2.1.7.16.ebuild b/sys-apps/portage/portage-2.1.7.16.ebuild index dbf3a45665ba..c6125873ee00 100644 --- a/sys-apps/portage/portage-2.1.7.16.ebuild +++ b/sys-apps/portage/portage-2.1.7.16.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/sys-apps/portage/portage-2.1.7.16.ebuild,v 1.8 2010/02/11 01:14:13 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild,v 1.9 2010/02/23 10:41:05 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -130,11 +130,14 @@ src_compile() { my_modules="$(find "${S}/pym" -name "*.py" \ | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ -e 's:/:.:g' | sort)" || die "error listing modules" + # workaround for bug 282760 + > "$S/pym/pysqlite2.py" PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ epydoc -o "${WORKDIR}"/api \ -qqqqq --no-frames --show-imports $epydoc_opts \ --name "${PN}" --url "${HOMEPAGE}" \ ${my_modules} || die "epydoc failed" + rm "$S/pym/pysqlite2.py" fi } diff --git a/sys-apps/portage/portage-2.1.7.17.ebuild b/sys-apps/portage/portage-2.1.7.17.ebuild index 9ebc4df78420..8ff4f86ad7a9 100644 --- a/sys-apps/portage/portage-2.1.7.17.ebuild +++ b/sys-apps/portage/portage-2.1.7.17.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/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.4 2010/02/11 01:14:13 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.5 2010/02/23 10:41:05 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -134,11 +134,14 @@ src_compile() { my_modules="$(find "${S}/pym" -name "*.py" \ | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ -e 's:/:.:g' | sort)" || die "error listing modules" + # workaround for bug 282760 + > "$S/pym/pysqlite2.py" PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ epydoc -o "${WORKDIR}"/api \ -qqqqq --no-frames --show-imports $epydoc_opts \ --name "${PN}" --url "${HOMEPAGE}" \ ${my_modules} || die "epydoc failed" + rm "$S/pym/pysqlite2.py" fi } diff --git a/sys-apps/portage/portage-2.2_rc62.ebuild b/sys-apps/portage/portage-2.2_rc62.ebuild index d2798431c3dc..323d947ab508 100644 --- a/sys-apps/portage/portage-2.2_rc62.ebuild +++ b/sys-apps/portage/portage-2.2_rc62.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/sys-apps/portage/portage-2.2_rc62.ebuild,v 1.3 2010/02/11 01:14:13 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc62.ebuild,v 1.4 2010/02/23 10:41:05 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -135,11 +135,14 @@ src_compile() { my_modules="$(find "${S}/pym" -name "*.py" \ | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ -e 's:/:.:g' | sort)" || die "error listing modules" + # workaround for bug 282760 + > "$S/pym/pysqlite2.py" PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ epydoc -o "${WORKDIR}"/api \ -qqqqq --no-frames --show-imports $epydoc_opts \ --name "${PN}" --url "${HOMEPAGE}" \ ${my_modules} || die "epydoc failed" + rm "$S/pym/pysqlite2.py" fi } diff --git a/sys-apps/portage/portage-2.2_rc63.ebuild b/sys-apps/portage/portage-2.2_rc63.ebuild index 902a4acd0801..d3fc3e2d7657 100644 --- a/sys-apps/portage/portage-2.2_rc63.ebuild +++ b/sys-apps/portage/portage-2.2_rc63.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/sys-apps/portage/portage-2.2_rc63.ebuild,v 1.1 2010/02/20 01:50:35 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc63.ebuild,v 1.2 2010/02/23 10:41:05 zmedico Exp $ # Require EAPI 2 since we now require at least python-2.6 (for python 3 # syntax support) which also requires EAPI 2. @@ -135,11 +135,14 @@ src_compile() { my_modules="$(find "${S}/pym" -name "*.py" \ | sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \ -e 's:/:.:g' | sort)" || die "error listing modules" + # workaround for bug 282760 + > "$S/pym/pysqlite2.py" PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \ epydoc -o "${WORKDIR}"/api \ -qqqqq --no-frames --show-imports $epydoc_opts \ --name "${PN}" --url "${HOMEPAGE}" \ ${my_modules} || die "epydoc failed" + rm "$S/pym/pysqlite2.py" fi }