Fixed line breaks errors in ebuild. Removed older version. Closes Bug #255946. Thanks Walter and Steve for helping

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.18-gentoo-r3 i686

3 files changed, 36 insertions, 25 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 980aa9f228fc..921fc5c784b5 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.361 2009/01/22 01:13:20 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.362 2009/01/24 01:58:57 neurogeek Exp $
+
+*python-2.5.4-r2 (24 Jan 2009)
+
+  24 Jan 2009; Jesus Rivero <neurogeek@gentoo.org> -python-2.5.4-r1.ebuild,
+  +python-2.5.4-r2.ebuild:
+  Fixed line breaks errors in ebuild. Removed older version. Closes Bug
+  #255946. Thanks Walter and Steve for helping
 
 *python-2.5.4-r1 (22 Jan 2009)
 
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index f875f7afca21..e8404ade12e9 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX depreorder-topsort.py 1958 RMD160 4192ad9ed14064a9da42ce1faedcf28996094da3 SHA1 2c900abeb6cfcc4327f0e9418b5abd7761ce5879 SHA256 7406f639d17b8acab6a1db7e398e74379b44950d4821bc36901abd3455d63b3d
 AUX depreorder.py 2235 RMD160 a6da5f336bdf8c370861c7922a5fa79ce4ab89cb SHA1 3b8590d7fbece2367088c646a792a9618d786dec SHA256 93920120e596f34e4222e8686e6283b03cdd517f89f2dba3eda90d79fa016aba
 AUX pydoc.conf 330 RMD160 0cd619ec251597e0fcadc05bfd249915e73baa17 SHA1 a56100d45378c554b9822f6ed512a6cb7841ef50 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1
@@ -31,8 +34,15 @@ EBUILD python-2.4.4-r5.ebuild 10350 RMD160 78336696a0641eeadc52af46f921b89d9cbd3
 EBUILD python-2.4.4-r6.ebuild 10351 RMD160 82482481fce6d802c5ff55dd3582acd33771115b SHA1 85c075d7626f8bc684b83419e9747a616f34f2ed SHA256 6b474f6320d13d3cbaecd9d785dd9a9fe980c626a7fd10d3c1478b0314905f7e
 EBUILD python-2.5.2-r7.ebuild 10378 RMD160 f17304fa00ab72221f66061c812d2de92cf0446a SHA1 c5d7af3140b8531a4690298922827de762a861b3 SHA256 aceb0c8da6e23042b9ee599c5c35939792092676c1a6fc5127aae1853922e500
 EBUILD python-2.5.2-r8.ebuild 10570 RMD160 1a86f3b548b7cad795ad1be3696b1c3c6056c827 SHA1 34cf3268088e56dfb04a94d88b9e704c1946cbcf SHA256 1557a080890d24f64d4749323741cd313c05bcde5cf6347442fb06c200e05589
-EBUILD python-2.5.4-r1.ebuild 10709 RMD160 cbd2489dc4ab007895f4e4c9f3ade8638b64b87a SHA1 65bdcb2dcfe3487864107d8d38aa795243511b33 SHA256 c4eba25b1eed3d9f3d8e252fbdb7802db085d7440ef3617efbf33e92dcbc2e05
+EBUILD python-2.5.4-r2.ebuild 10734 RMD160 c5dc01e2eec904042be8f232f6146c343e5b7f67 SHA1 2cfbf7c29e1073d0cd54318bcf50a2a6f44562ca SHA256 c10ad665b357e6da43e3348d3c9463dc58f751b25c87684449b173c4593ef255
 EBUILD python-2.6-r5.ebuild 8456 RMD160 c1e2c4c597318d36a47b1f089001de29b1e64645 SHA1 991049269f4ee57749d17a9f049e42d3bf96baf7 SHA256 b5a446068ded5c40d85cf76b0751e33912234670761a46cea717e6867a10a786
 EBUILD python-2.6.1.ebuild 8506 RMD160 3b61561c7c954c3593eb16c20ba86e10ae9d8ae2 SHA1 9060e87693b5951271d1deb3562d478096296541 SHA256 572b0c9853d59b16d452452a62a3806cabc28fc300aac17838b9ddd574496ee2
-MISC ChangeLog 63796 RMD160 1afb80238794e35589f8f367f6f3fccf7541a267 SHA1 3177ee5d0ec7c203d20ea0d94067346eee4026bc SHA256 adafb2d9c154ee84ea06a5574397b43403b27692d68b409ee7aeee06f846abb0
+MISC ChangeLog 64051 RMD160 3318ff85dd09081e5ba286fa76ef6fe62b0d2744 SHA1 545ca798182bc16530fd17704ea76b832be1690d SHA256 4882c0cd9e8b07968a774e2e4ce543ab0cff2fef11403a805b8abe765eee0097
 MISC metadata.xml 490 RMD160 b919b92704616b974d1da46bfea1f03c7ea50330 SHA1 d1901bc18d0aa431b05fccfe13f2f87ab2aa9e18 SHA256 765be0142679faeeaf01cfa489424c3af08ad38ed627e6a7246b4a6f96f2dffa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkl6dfMACgkQdIssYB9vBoNCzwCeMALeCBggGZJYd01QxOYiz4n8
+HgMAn3/IMughKy6pdcNTJWdrOZMynZXJ
+=b8Ay
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.5.4-r1.ebuild b/dev-lang/python/python-2.5.4-r2.ebuild
index 253271192a46..2ad63531b863 100644
--- a/dev-lang/python/python-2.5.4-r1.ebuild
+++ b/dev-lang/python/python-2.5.4-r2.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/dev-lang/python/python-2.5.4-r1.ebuild,v 1.2 2009/01/22 05:45:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r2.ebuild,v 1.1 2009/01/24 01:58:57 neurogeek Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -19,18 +19,15 @@ PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 MY_P="Python-${PV}"
 S="${WORKDIR}/${MY_P}"
 
-DESCRIPTION="Python is an interpreted, interactive, object-oriented programming
-language."
+DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
 HOMEPAGE="http://www.python.org/"
 SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
 		 mirror://gentoo/python-gentoo-patches-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
-~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="+xml ncurses gdbm ssl readline tk berkdb ipv6 build ucs2 sqlite doc
-+threads examples elibc_uclibc wininst"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="+xml ncurses gdbm ssl readline tk berkdb ipv6 build ucs2 sqlite doc +threads examples elibc_uclibc wininst"
 
 # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs}
 #       do not conflict with the ones in python proper. - liquidx
@@ -93,8 +90,7 @@ src_unpack() {
 src_configure() {
 	# disable extraneous modules with extra dependencies
 	if use build; then
-		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses
-_curses_panel _tkinter _sqlite3"
+		export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter _sqlite3"
 		export PYTHON_DISABLE_SSL=1
 	else
 		# dbm module can link to berkdb or gdbm
@@ -194,8 +190,8 @@ src_install() {
 	src_configure
 	make DESTDIR="${D}" altinstall maninstall || die
 
-	mv "${D}"/usr/bin/python${PYVER}-config
-"${D}"/usr/bin/python-config-${PYVER}
+	mv "${D}"/usr/bin/python${PYVER}-config \
+		"${D}"/usr/bin/python-config-${PYVER}
 
 	# Fix slotted collisions
 	mv "${D}"/usr/bin/pydoc "${D}"/usr/bin/pydoc${PYVER}
@@ -211,11 +207,11 @@ src_install() {
 			/usr/$(get_libdir)/python${PYVER}/config/Makefile
 
 	if use build ; then
-		rm -rf
-"${D}"/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
+		rm -rf \
+			"${D}"/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test}
 	else
-		use elibc_uclibc && rm -rf
-"${D}"/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test}
+		use elibc_uclibc && rm -rf \
+			"${D}"/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test}
 		use berkdb || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/bsddb
 		use tk || rm -rf "${D}"/usr/$(get_libdir)/python${PYVER}/lib-tk
 	fi
@@ -281,9 +277,9 @@ pkg_postinst() {
 		if [ -f ${myroot}/usr/lib/python2.3/site-packages/portage.py ]; then
 			einfo "Working around possible python-portage upgrade breakage"
 			mkdir -p ${myroot}/usr/lib/portage/pym
-			cp
-${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py
-${myroot}/usr/lib/portage/pym
+			cp \
+			${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py \
+				${myroot}/usr/lib/portage/pym
 			python_mod_optimize /usr/lib/portage/pym
 		fi
 	fi
@@ -316,8 +312,7 @@ src_test() {
 
 	#skip all tests that fail during emerge but pass without emerge:
 	#(See bug# 67970)
-	local skip_tests="distutils global mimetools minidom mmap posix pyexpat sax
-strptime subprocess syntax tcl time urllib urllib2 webbrowser xml_etree"
+	local skip_tests="distutils global mimetools minidom mmap posix pyexpat sax strptime subprocess syntax tcl time urllib urllib2 webbrowser xml_etree"
 
 	# test_pow fails on alpha.
 	# http://bugs.python.org/issue756093
@@ -334,8 +329,7 @@ strptime subprocess syntax tcl time urllib urllib2 webbrowser xml_etree"
 		mv "${T}"/test_${test}.py "${S}"/Lib/test/test_${test}.py
 	done
 
-	elog "Portage skipped the following tests which aren't able to run from
-emerge:"
+	elog "Portage skipped the following tests which aren't able to run from emerge:"
 	for test in ${skip_tests} ; do
 		elog "test_${test}.py"
 	done