Remove forced -O2 optimization. whitespaces, overquoting, etc

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 29 insertions, 13 deletions

diff --git a/dev-tex/dvi2tty/ChangeLog b/dev-tex/dvi2tty/ChangeLog
index 4f2626f54259..3dc5dba567f5 100644
--- a/dev-tex/dvi2tty/ChangeLog
+++ b/dev-tex/dvi2tty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/dvi2tty
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/dvi2tty/ChangeLog,v 1.24 2011/11/05 18:51:57 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/dvi2tty/ChangeLog,v 1.25 2011/11/05 19:43:02 ssuominen Exp $
+
+  05 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+  files/dvi2tty-5.3.4-cflags.patch:
+  Remove forced -O2 optimization.
 
 *dvi2tty-5.3.4 (05 Nov 2011)
 
diff --git a/dev-tex/dvi2tty/Manifest b/dev-tex/dvi2tty/Manifest
index 3f8b7c490495..f83acc68eeca 100644
--- a/dev-tex/dvi2tty/Manifest
+++ b/dev-tex/dvi2tty/Manifest
@@ -1,10 +1,24 @@
-AUX dvi2tty-5.3.4-cflags.patch 808 RMD160 22b412ac4e25349d1e8578c474375efa395cdf5b SHA1 074cd34a215939e2a13468e8ae1ce6ba48267985 SHA256 16d2b6b2a8d7af819ce97f434683362832c079e2b0864ebed1f1b53fa598b74c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX dvi2tty-5.3.4-cflags.patch 643 RMD160 bfb1d991813db54e1e3cd0372d7a9ecd69de3528 SHA1 936bd032a247c8499cb3d7813f49cff2ebef72fb SHA256 28c1ca89f7aa0de7e2efcca31f6051073ce119bd72cbcac6462b2222b9bbdbd2
 AUX dvi2tty-cflags.patch 688 RMD160 57800e1992da9b0e87ae563959cde4793082b994 SHA1 db69a9c63cfc4a039de2f0424f9d7af37da518eb SHA256 6659f2ca148e8b6217c962ed9baf5353de672061d06962e1902de42797617f1a
 AUX dvi2tty-gcc.patch 341 RMD160 ad0334af112037fae9ee1fa7e67287bf65ba0665 SHA1 82cb5e16cc8336fb1d9c13bb6e4bf77ea2d85f23 SHA256 79e510dd5145a4939001235292cc560e92bde1b4d10b486445538863ed0da1d5
 AUX dvi2tty-getline.patch 2476 RMD160 e64479d12a54cbeb12bd4026369625451d9ffa79 SHA1 8fe1e58e04ee24f8b922398ccd68e9926ea6c161 SHA256 7e6805b9faf5e54d1503656c862178970136614a785a40c4cc98773e39cf2dcc
 DIST dvi2tty-5.3.1.tar.gz 61374 RMD160 a95b70bb93e46af7d50c5462e697b81eee1ce1d2 SHA1 268cd0a0e7c85afaf43cda8891a8aa87157f4d3c SHA256 341a40f2682042a4ff4da521c5865f2147eb2f0b2dee70c37e08bf003488d813
 DIST dvi2tty-5.3.4.tgz 59519 RMD160 dd381beca90571754971c65a661b6e25e0f09b4e SHA1 64951ccbb4ec2bc22dad4ffb8086d64b0859f30d SHA256 5272ef88b99ebc0fe58c868fb4752408dfe8b23d7d8b86d7b87357d7206995e6
 EBUILD dvi2tty-5.3.1.ebuild 820 RMD160 df3c2c7ede9421845d381dd805a9da3ea3a9dd56 SHA1 c40828970defebdd5526536ed9b5886b3c2a36d8 SHA256 5e8f0ac002906f59b9e2b7708c6819cd2c34905628755dba883c0dba5070d494
-EBUILD dvi2tty-5.3.4.ebuild 760 RMD160 77f96fcc37b3ec4b4eee7ff8cdcc0ce8ebdacde5 SHA1 408e896192de826b7c07184158b9a9f7dddb5ce5 SHA256 336798bd199c83a3fd449ad17e4526d52ffc7c73596fa0af9eeb2a77ed973868
-MISC ChangeLog 2943 RMD160 237da14cf3d6045d65f48f62e6a564b175b19ea5 SHA1 96e8880c6f53ada684fd77f7e21f49e35b2d0b45 SHA256 3de24491037bdbb36d5f62c3f43e955bd2ae98e7cbe7bfb1ea1fedce5a6eee93
+EBUILD dvi2tty-5.3.4.ebuild 744 RMD160 8281ed1bd58c023536fe749204d4a7c54d54ad89 SHA1 fd6e95e8095529e12d228932dc770c4699a0533c SHA256 a1115aa0f05b7e8c9afab1a4d9c5b42d96f044a74667ac2829d1ebd813173f1e
+MISC ChangeLog 3068 RMD160 3611ee739dd42efe5df5bdc458e7072501585bc4 SHA1 c06a7da97d22ef7e5a0cce5a3f965d80bda3049f SHA256 5575e8079ea2b2e7e908747bc6db11fe642d4ad8b075ffe6e8e81a556e38dda6
 MISC metadata.xml 368 RMD160 c7c623065cbbed805de2aecb225343918a242396 SHA1 80dacd36c1efea1834da2b5d8e39c9576e011093 SHA256 c23b2855d09267e72f7940113148298deb7d131b3b5691cbbc80ed14fa204a07
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJOtZGpAAoJEEdUh39IaPFN354H/0RUmhM/wiNRVuuU0wWV1uhk
+cu7PZ6NDxPxpx137LJ0PpMavBAhVbeVcS4N/+RH8trTR/0aO4DnC9yvYaE257cL8
+4OVxhksJKQAHB8o+huQsQ03D5Cq72E9NwMqqf3UMusZb/b8cCoHpvno/nNUvMZYW
+JKZUowXR3DUEVGQvIHiatIAqqm1q1OK6zR12bOykh5CehIvqhvjbaUedsAqMj4AP
+pSd8b2DLXgQ/6s4gJqS3iXuF/LxTdLSp3IZibO41VHeNLr9qUdHMqyFVKG77GfOv
+bu45nSGtsVm31VKQg0kb34eNjPBV60sduL3OxPdRZlfgglz7CygE+ghPnrzW8Cw=
+=rNh8
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild b/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild
index 4d3042683cb9..fe44fc588902 100644
--- a/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild
+++ b/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild,v 1.1 2011/11/05 18:51:57 maksbotan Exp $
-
-EAPI="4"
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild,v 1.2 2011/11/05 19:43:02 ssuominen Exp $
 
+EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Preview dvi-files on text-only devices"
@@ -16,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-
 IUSE=""
 
 src_prepare() {
-        epatch "${FILESDIR}/${PN}-${PV}-cflags.patch"
+	epatch "${FILESDIR}"/${P}-cflags.patch
 }
 
 src_compile() {
@@ -28,4 +27,4 @@ src_install() {
 	dobin dvi2tty disdvi
 	doman dvi2tty.1 disdvi.1
 	dodoc README TODO
-}
\ No newline at end of file
+}
diff --git a/dev-tex/dvi2tty/files/dvi2tty-5.3.4-cflags.patch b/dev-tex/dvi2tty/files/dvi2tty-5.3.4-cflags.patch
index 99e8b02c90f3..5b26bcfbcbfd 100644
--- a/dev-tex/dvi2tty/files/dvi2tty-5.3.4-cflags.patch
+++ b/dev-tex/dvi2tty/files/dvi2tty-5.3.4-cflags.patch
@@ -1,12 +1,11 @@
-diff -ur dvi2tty-5.3.4.orig//Makefile dvi2tty-5.3.4/Makefile
---- dvi2tty-5.3.4/Makefile	2010-10-27 17:01:32.000000000 +0800
-+++ dvi2tty-5.3.4/Makefile	2011-11-06 00:50:37.738815333 +0800
+--- Makefile
++++ Makefile
 @@ -8,9 +8,8 @@
  #
  CC = gcc
  
 -CFLAGS = -Wall -O2
-+CFLAGS += -Wall -O2
++CFLAGS += -Wall
  # CFLAGS = -Wall -O2 -fomit-frame-pointer
 -LDFLAGS = -s