diff --git a/app-emulation/qemu/qemu-0.15.1.recipe b/app-emulation/qemu/qemu-0.15.1.recipe
index 75239c251..77b6534d3 100644
--- a/app-emulation/qemu/qemu-0.15.1.recipe
+++ b/app-emulation/qemu/qemu-0.15.1.recipe
@@ -1,11 +1,16 @@
-SUMMARY="QEMU is a generic and open source machine emulator and virtualizer."
-DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer."
+SUMMARY="A generic and open source machine emulator and virtualizer"
+DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer.
+
+QEMU can run OSes and programs made for one machine (e.g. an ARM board) on a \
+different machine (e.g. your own PC). By using dynamic translation, it \
+achieves very good performance."
 HOMEPAGE="http://wiki.qemu.org/"
-SOURCE_URI="git+https://github.com/mmlr/qemu-haiku.git#1b50193d3b850f1e64b76e9a0ee7b007387ac99b"
 COPYRIGHT="2003-2008 Fabrice Bellard"
 LICENSE="GNU GPL v2"
 REVISION="1"
+SOURCE_URI="git+https://github.com/mmlr/qemu-haiku.git#1b50193d3b850f1e64b76e9a0ee7b007387ac99b"
 CHECKSUM_MD5="489f26907f807bde3c4579e4d11e1195"
+
 ARCHITECTURES="x86"
 
 PROVIDES="
@@ -32,27 +37,25 @@ PROVIDES="
 	cmd:qemu_system_sparc = $portVersion
 	cmd:qemu_system_sparc64 = $portVersion
 	cmd:qemu_system_x86_64 = $portVersion
-"
-
+	"
 REQUIRES="
 	haiku
 	lib:libz
-"
+	"
 
 BUILD_REQUIRES="
 	haiku_devel
 	devel:libz
-"
-
+	"
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:ld
 	cmd:make
-"
+	"
 
 GLOBAL_WRITABLE_FILES="
 	settings/etc/qemu/target-x86_64.conf keep-old
-"
+	"
 
 BUILD()
 {
diff --git a/app-emulation/qemu/qemu-1.7.0.recipe b/app-emulation/qemu/qemu-1.7.0.recipe
index 4a3c24417..dd17114e7 100644
--- a/app-emulation/qemu/qemu-1.7.0.recipe
+++ b/app-emulation/qemu/qemu-1.7.0.recipe
@@ -1,12 +1,16 @@
-SUMMARY="QEMU is a generic and open source machine emulator and virtualizer."
-DESCRIPTION="
-QEMU is a generic and open source machine emulator and virtualizer.
-"
+SUMMARY="A generic and open source machine emulator and virtualizer"
+DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer.
+
+QEMU can run OSes and programs made for one machine (e.g. an ARM board) on a \
+different machine (e.g. your own PC). By using dynamic translation, it \
+achieves very good performance."
 HOMEPAGE="http://wiki.qemu.org/"
-SOURCE_URI="git+https://github.com/mmlr/qemu-haiku.git#e57972be33c91222a580d47c68b135aa8fa7b4c3"
 COPYRIGHT="2003-2008 Fabrice Bellard"
 LICENSE="GNU GPL v2"
 REVISION="1"
+SOURCE_URI="git+https://github.com/mmlr/qemu-haiku.git#e57972be33c91222a580d47c68b135aa8fa7b4c3"
+PATCHES="qemu-1.7.0.patchset"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -15,8 +19,6 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 fi
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="qemu-1.7.0.patchset"
-
 PROVIDES="
 	qemu$secondaryArchSuffix = $portVersion
 	cmd:qemu$secondaryArchSuffix = $portVersion
@@ -49,7 +51,6 @@ PROVIDES="
 	cmd:qemu_system_xtensa$secondaryArchSuffix = $portVersion
 	cmd:qemu_system_xtensaeb$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -65,7 +66,6 @@ BUILD_REQUIRES="
 	glib2${secondaryArchSuffix}_devel >= 2.12
 	pixman${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:awk
diff --git a/app-emulation/qemu/qemu-2.0.0.recipe b/app-emulation/qemu/qemu-2.0.0.recipe
index c6742f8f8..a62cf7514 100644
--- a/app-emulation/qemu/qemu-2.0.0.recipe
+++ b/app-emulation/qemu/qemu-2.0.0.recipe
@@ -1,17 +1,17 @@
-SUMMARY="QEMU is a generic and open source machine emulator and virtualizer."
-DESCRIPTION="
-QEMU is a generic and open source machine emulator and virtualizer.
+SUMMARY="A generic and open source machine emulator and virtualizer"
+DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer.
 
 QEMU can run OSes and programs made for one machine (e.g. an ARM board) on a \
 different machine (e.g. your own PC). By using dynamic translation, it \
-achieves very good performance.
-"
+achieves very good performance."
 HOMEPAGE="http://wiki.qemu.org/"
-SOURCE_URI="http://wiki.qemu-project.org/download/qemu-2.0.0.tar.bz2"
-CHECKSUM_SHA256="60cc1aa0cad39cec891f970bed60ca8a484f071adad4943123599ac223543a3b"
 COPYRIGHT="2003-2014 Fabrice Bellard"
 LICENSE="GNU GPL v2"
 REVISION="1"
+SOURCE_URI="http://wiki.qemu-project.org/download/qemu-2.0.0.tar.bz2"
+CHECKSUM_SHA256="60cc1aa0cad39cec891f970bed60ca8a484f071adad4943123599ac223543a3b"
+PATCHES="qemu-$portVersion.patchset"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -53,9 +53,6 @@ PROVIDES="
 	cmd:qemu_system_xtensa$secondaryArchSuffix = $portVersion
 	cmd:qemu_system_xtensaeb$secondaryArchSuffix = $portVersion
 	"
-
-PATCHES="qemu-$portVersion.patchset"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -73,7 +70,6 @@ BUILD_REQUIRES="
 	glib2${secondaryArchSuffix}_devel >= 2.12
 	pixman${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:awk
diff --git a/app-emulation/qemu/qemu-2.1.0.recipe b/app-emulation/qemu/qemu-2.1.0.recipe
index dace41d9c..27d1ee46e 100644
--- a/app-emulation/qemu/qemu-2.1.0.recipe
+++ b/app-emulation/qemu/qemu-2.1.0.recipe
@@ -1,16 +1,15 @@
-SUMMARY="QEMU is a generic and open source machine emulator and virtualizer."
-DESCRIPTION="
-QEMU is a generic and open source machine emulator and virtualizer.
+SUMMARY="A generic and open source machine emulator and virtualizer"
+DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer.
 
 QEMU can run OSes and programs made for one machine (e.g. an ARM board) on a \
 different machine (e.g. your own PC). By using dynamic translation, it \
-achieves very good performance.
-"
+achieves very good performance."
 HOMEPAGE="http://wiki.qemu.org/"
-SOURCE_URI="git+https://github.com/mmlr/qemu-haiku.git#4444401842251c18147f83c7d960ec3a82f2b9cb"
 COPYRIGHT="2003-2014 Fabrice Bellard"
 LICENSE="GNU GPL v2"
 REVISION="3"
+SOURCE_URI="git+https://github.com/mmlr/qemu-haiku.git#4444401842251c18147f83c7d960ec3a82f2b9cb"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -52,7 +51,6 @@ PROVIDES="
 	cmd:qemu_system_xtensa$secondaryArchSuffix = $portVersion
 	cmd:qemu_system_xtensaeb$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -68,7 +66,6 @@ BUILD_REQUIRES="
 	devel:libglib_2.0$secondaryArchSuffix >= 0.38
 	devel:libpixman_1${secondaryArchSuffix}
 	"
-
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	cmd:awk
diff --git a/app-emulation/qemu/qemu-2.1.2.recipe b/app-emulation/qemu/qemu-2.1.2.recipe
index 0e9afd476..91e726a2e 100644
--- a/app-emulation/qemu/qemu-2.1.2.recipe
+++ b/app-emulation/qemu/qemu-2.1.2.recipe
@@ -1,16 +1,16 @@
 SUMMARY="A generic and open source machine emulator and virtualizer"
-DESCRIPTION="
-QEMU is a generic and open source machine emulator and virtualizer.
+DESCRIPTION="QEMU is a generic and open source machine emulator and virtualizer.
 
 QEMU can run OSes and programs made for one machine (e.g. an ARM board) on a \
 different machine (e.g. your own PC). By using dynamic translation, it \
-achieves very good performance.
-"
+achieves very good performance."
 HOMEPAGE="http://wiki.qemu.org/"
-SOURCE_URI="git+https://github.com/mmlr/qemu-haiku.git#d1b55862305d1eac5c7ca7cc56ec379bbc452d74"
 COPYRIGHT="2003-2014 Fabrice Bellard"
 LICENSE="GNU GPL v2"
 REVISION="2"
+
+SOURCE_URI="git+https://github.com/mmlr/qemu-haiku.git#d1b55862305d1eac5c7ca7cc56ec379bbc452d74"
+
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -60,6 +60,7 @@ REQUIRES="
 	lib:libglib_2.0$secondaryArchSuffix >= 0.38
 	lib:libpixman_1$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	devel:libfdt$secondaryArchSuffix
diff --git a/dev-python/mako/python3_mako-1.0.1.recipe b/dev-python/mako/python3_mako-1.0.1.recipe
index 10b4df7f1..cd23c1188 100644
--- a/dev-python/mako/python3_mako-1.0.1.recipe
+++ b/dev-python/mako/python3_mako-1.0.1.recipe
@@ -1,23 +1,20 @@
-SUMMARY="Hyperfast and lightweight templating for the Python platform."
-DESCRIPTION="
-Mako is a Hyperfast and lightweight templating system for the Python platform
-"
+SUMMARY="Hyperfast and lightweight templating for the Python platform"
+DESCRIPTION="Mako is a Hyperfast and lightweight templating system for the \
+Python platform."
 HOMEPAGE="http://www.makotemplates.org"
+COPYRIGHT="2006-2015 the Mako authors and contributors"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="https://pypi.python.org/packages/source/M/Mako/Mako-1.0.1.tar.gz"
 CHECKSUM_SHA256="45f0869febea59dab7efd256fb451c377cbb7947bef386ff0bb44627c31a8d1c"
-LICENSE="MIT"
-COPYRIGHT="2006-2015 the Mako authors and contributors"
-REVISION="1"
+SOURCE_DIR="Mako-$portVersion"
 
 ARCHITECTURES="arm ppc x86 x86_gcc2 x86_64"
 
-SOURCE_DIR="Mako-$portVersion"
-
 PROVIDES="
 	python3_mako = $portVersion
 	cmd:mako_render
 	"
-
 REQUIRES="
 	haiku
 	cmd:python3
@@ -26,7 +23,6 @@ REQUIRES="
 BUILD_REQUIRES="
 	python3_setuptools
 	"
-
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:python3
diff --git a/dev-python/mako/python_mako-1.0.1.recipe b/dev-python/mako/python_mako-1.0.1.recipe
index e686bbaf9..04cb6bfbf 100644
--- a/dev-python/mako/python_mako-1.0.1.recipe
+++ b/dev-python/mako/python_mako-1.0.1.recipe
@@ -1,23 +1,20 @@
-SUMMARY="Hyperfast and lightweight templating for the Python platform."
-DESCRIPTION="
-Mako is a Hyperfast and lightweight templating system for the Python platform
-"
+SUMMARY="Hyperfast and lightweight templating for the Python platform"
+DESCRIPTION="Mako is a Hyperfast and lightweight templating system for the \
+Python platform."
 HOMEPAGE="http://www.makotemplates.org"
+COPYRIGHT="2006-2015 the Mako authors and contributors"
+LICENSE="MIT"
+REVISION="1"
 SOURCE_URI="https://pypi.python.org/packages/source/M/Mako/Mako-1.0.1.tar.gz"
 CHECKSUM_SHA256="45f0869febea59dab7efd256fb451c377cbb7947bef386ff0bb44627c31a8d1c"
-LICENSE="MIT"
-COPYRIGHT="2006-2015 the Mako authors and contributors"
-REVISION="2"
+SOURCE_DIR="Mako-$portVersion"
 
 ARCHITECTURES="arm ppc x86 x86_gcc2 x86_64"
 
-SOURCE_DIR="Mako-$portVersion"
-
 PROVIDES="
 	python_mako = $portVersion
 	cmd:mako_render
 	"
-
 REQUIRES="
 	haiku
 	cmd:python
@@ -26,7 +23,6 @@ REQUIRES="
 BUILD_REQUIRES="
 	python_setuptools
 	"
-
 BUILD_PREREQUIRES="
 	haiku_devel
 	cmd:python
diff --git a/dev-python/pygame/patches/pygame-1.9.1.patchset b/dev-python/pygame/patches/pygame-1.9.1.patchset
index 83e2d9462..44132c2c9 100644
--- a/dev-python/pygame/patches/pygame-1.9.1.patchset
+++ b/dev-python/pygame/patches/pygame-1.9.1.patchset
@@ -1,3 +1,9 @@
+From 34766c430d884038a4743c86aa1b3f2460c51351 Mon Sep 17 00:00:00 2001
+From: Humdinger <humdingerb@gmail.com>
+Date: Thu, 23 Jul 2015 07:04:01 +0200
+Subject: Now formatted existing patch.
+
+
 diff --git a/Setup.in b/Setup.in
 index 4bb6c1c..9236df4 100644
 --- a/Setup.in
@@ -1494,3 +1500,6 @@ index c997deb..ee0d03d 100644
  
  
  typedef void (* SMOOTHSCALE_FILTER_P)(Uint8 *, Uint8 *, int, int, int, int, int);
+-- 
+2.2.2
+
diff --git a/dev-python/pygame/pygame-1.9.1.recipe b/dev-python/pygame/pygame-1.9.1.recipe
index 985b3b069..4b9a5a21b 100644
--- a/dev-python/pygame/pygame-1.9.1.recipe
+++ b/dev-python/pygame/pygame-1.9.1.recipe
@@ -1,21 +1,18 @@
-SUMMARY="PyGame - a popular game development module for python"
-DESCRIPTION="
-PyGame - python bindings to sdl and other libs that facilitate game production.
-"
-HOMEPAGE="http://www.pygame.org/" 
-SOURCE_URI="http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz"
-CHECKSUM_MD5="1c4cdc708d17c8250a2d78ef997222fc"
-CHECKSUM_SHA256="a26095472ae4be9631e0d5bfb9a52ac57a3a091e45757913128e4a473807d433"
-
+SUMMARY="A popular game development module for python"
+DESCRIPTION="PyGame - python bindings to sdl and other libs that facilitate \
+game production."
+HOMEPAGE="http://www.pygame.org/"
 COPYRIGHT="2000-2004, 2007  Pete Shinners
 	2004 Takafumi Mizuno
 	2006-2007 Rene Dudfield
 	2007 Richard Goedeken
-	2007-2008 Marcus von Appen
-	"
+	2007-2008 Marcus von Appen"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
-
+SOURCE_URI="http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz"
+CHECKSUM_SHA256="a26095472ae4be9631e0d5bfb9a52ac57a3a091e45757913128e4a473807d433"
+SOURCE_DIR="pygame-1.9.1release"
+PATCHES="pygame-1.9.1.patchset"
 #
 # No stable python_x86 => impossible to build _x86
 #
@@ -30,8 +27,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
 #fi
 #SECONDARY_ARCHITECTURES="x86"
 
-SOURCE_DIR="pygame-1.9.1release"
-
 PROVIDES="
 	pygame${secondaryArchSuffix} = $portVersion
 	"
@@ -52,6 +47,10 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	"
+#libjpeg ^
+#        |
+BUILD_PREREQUIRES="
 	python >= 2.6.4
 	gcc${secondaryArchSuffix}
 	libsdl${secondaryArchSuffix}_devel >= 1.2.14
@@ -63,11 +62,6 @@ BUILD_REQUIRES="
 	smpeg${secondaryArchSuffix}_devel >= 0.4.5
 	sdl_gfx${secondaryArchSuffix}_devel	
 	"
-#libjpeg ^
-#        |
-
-BUILD_PREREQUIRES="
-	"
 	
 BUILD()
 {
@@ -82,4 +76,3 @@ INSTALL()
 	echo "n" | python setup.py install \
 		--prefix=$prefix || exit 1
 }
-
diff --git a/dev-python/setuptools/python3_setuptools-17.0.recipe b/dev-python/setuptools/python3_setuptools-17.0.recipe
index c11386c0b..9caad525d 100644
--- a/dev-python/setuptools/python3_setuptools-17.0.recipe
+++ b/dev-python/setuptools/python3_setuptools-17.0.recipe
@@ -1,31 +1,30 @@
-SUMMARY="Easily download, build, install, upgrade, and uninstall Python packages."
+SUMMARY="Download, build, install, upgrade, and uninstall Python packages"
 DESCRIPTION="EasyInstall (easy_install) gives you a quick and painless way \
 to install packages remotely by connecting to the cheeseshop or even other \
-websites via HTTP. It is somewhat analogous to the CPAN and PEAR tools for Perl \
-and PHP, respectively. \
-"
+websites via HTTP. It is somewhat analogous to the CPAN and PEAR tools for \
+Perl and PHP, respectively."
 HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+COPYRIGHT="2006-2014 Python Packaging Authority"
+LICENSE="Python"
+REVISION="1"
 SOURCE_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.zip"
 CHECKSUM_SHA256="11e77e37c768f77b652003594fb5a0aaa3e4cbb10c07ede2397c9233885b6c7f"
 SOURCE_DIR="setuptools-$portVersion"
-LICENSE="Python"
-COPYRIGHT="2006-2014 Python Packaging Authority"
-REVISION="1"
+
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
 	python3_setuptools = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	cmd:python3
 	"
 
-BUILD_REQUIRES=""
-
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:python3
 	cmd:sed
 	"
diff --git a/dev-python/setuptools/python_setuptools-5.3.recipe b/dev-python/setuptools/python_setuptools-5.3.recipe
index 34430e1e6..ae0fc4ddf 100644
--- a/dev-python/setuptools/python_setuptools-5.3.recipe
+++ b/dev-python/setuptools/python_setuptools-5.3.recipe
@@ -1,31 +1,30 @@
-SUMMARY="Easily download, build, install, upgrade, and uninstall Python packages."
+SUMMARY="Download, build, install, upgrade, and uninstall Python packages"
 DESCRIPTION="EasyInstall (easy_install) gives you a quick and painless way \
 to install packages remotely by connecting to the cheeseshop or even other \
-websites via HTTP. It is somewhat analogous to the CPAN and PEAR tools for Perl \
-and PHP, respectively. \
-"
+websites via HTTP. It is somewhat analogous to the CPAN and PEAR tools for \
+Perl and PHP, respectively."
 HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+COPYRIGHT="2006-2014 Python Packaging Authority"
+LICENSE="Python"
+REVISION="2"
 SOURCE_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-5.3.zip"
 CHECKSUM_SHA256="238142293c36d2b56c83df1886b4c1fc4af77d0c203c68b8f4e57d8995babfe5"
 SOURCE_DIR="setuptools-$portVersion"
-LICENSE="Python"
-COPYRIGHT="2006-2014 Python Packaging Authority"
-REVISION="2"
+
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
 	python_setuptools = $portVersion
 	"
-
 REQUIRES="
 	haiku
 	cmd:python
 	"
 
-BUILD_REQUIRES=""
-
-BUILD_PREREQUIRES="
+BUILD_REQUIRES="
 	haiku_devel
+	"
+BUILD_PREREQUIRES="
 	cmd:python
 	cmd:sed
 	"
diff --git a/media-libs/netpbm/netpbm-10.68.recipe b/media-libs/netpbm/netpbm-10.68.recipe
index 6b7274dca..e1f38a02e 100644
--- a/media-libs/netpbm/netpbm-10.68.recipe
+++ b/media-libs/netpbm/netpbm-10.68.recipe
@@ -10,226 +10,225 @@ Examples of the sort of image manipulation we're talking about are:
 - Making a mirror image
 - Creating a sequence of images that fade from one image to another"
 HOMEPAGE="http://netpbm.sourceforge.net"
-COPYRIGHT="
-411toppm:      2001      Steve Allen
-anytopnm:      1991      Jef Poskanzer
-asciitopgm:    1989      Wilson H. Bent, Jr
-atktopbm:      1991      Bill Janssen
-bioradtopgm:   1993      Oliver Trepte
-bmptoppm:      1992      David W. Sanderson
-brushtopbm:    1988      Jef Poskanzer
-cmuwmtopbm:    1989      Jef Poskanzer
-eyuvtoppm:     1995      The Regents of the University of California
-fiascotopnm:   1994-2000 Ullrich Hafner
-fitstopnm:     1989      Jef Poskanzer
-fstopgm:       1989      Jef Poskanzer
-g3topbm:       1989      Paul Haeberli
-gemtopbm:      1988      Diomidis D. Spinellis
-gemtopnm:      1988      Diomidis D. Spinellis
-giftopnm:      1990-1993 David Koblas
-gouldtoppm:    1990      Stephen P. Lesniewski
-hipstopgm:     1989      Jef Poskanzer
-icontopbm:     1988      Jef Poskanzer
-ilbmtoppm:     1989      Jef Poskanzer
-imgtoppm:      1989      Jef Poskanzer
-jbigtopnm:     2000      Markus Kuhn
-jpegtopnm:     1991-2000 Thomas G. Lane, Bryan Henderson
-leaftoppm:     1994      Bill O'Donnell
-lispmtopgm:    1988      Jef Poskanzer, Jamie Zawinski
-macptopbm:     1988      Jef Poskanzer
-mdatopbm:      1999      John Elliott
-mgrtopbm:      1989      Jef Poskanzer
-mtvtoppm:      1989      Jef Poskanzer
-neotoppm:      2001      Teemu Hukkanen
-palmtopnm:     1995-2000 Ian Goldberg, Bill Janssen
-pamcut:        1989      Jef Poskanzer
-pamfile:       1991      Jef Poskanzer
-pamoil:        1990      Wilson Bent
-pbmclean:      1989-1990 Jef Poskanzer, Angus Duggan
-pbmlife:       1988-1991 Jef Poskanzer
-pbmmake:       1988      Jef Poskanzer
-pbmmask:       1989-1991 Jef Poskanzer
-pbmpage:       1998      Tim Norman
-pbmpscale:     1989-1990 Jef Poskanzer, Angus Duggan
-pbmreduce:     1989      Jef Poskanzer
-pbmtext:       1991      Jef Poskanzer
-pbmto10x:      1990-1994 Ken Yap
-pbmtoascii:    1988-1992 Jef Poskanzer
-pbmtoatk:      1991      Bill Janssen
-pbmtobbnbg:    1989      Mike Parker
-pbmtocmuwm:    1989      Jef Poskanzer
-pbmtoepsi:     1988      Jef Poskanzer
-pbmtoepson:    1990      Jef Poskanzer, John Tiller
-pbmtog3:       1989      Paul Haeberli
-pbmtogem:      1988      Jef Poskanzer, David Beckemeyer
-pbmtogo:       1988-1989 Jef Poskanzer, Michael Haberler, Bo Thide'
-pbmtoicon:     1988      Jef Poskanzer
-pbmtolj:       1988      Jef Poskanzer, Michael Haberler
-pbmtomacp:     1988      Douwe vand der Schaaf
-pbmtomda:      1999      John Elliott
-pbmtomgr:      1989      Jef Poskanzer
-pbmtonokia:    2001      OMS Open Media System GmbH, Tim R<FC>hsen
-pbmtopgm:      1989-1990 Jef Poskanzer, Angus Duggan
-pbmtopi3:      1988      David Beckemeyer and Jef Poskanzer
-pbmtoplot:     1990      Arthur David Olson
-pbmtoppa:      1998      Tim Norman
-pbmtopsg3:     2001      Kristof Koehler
-pbmtoptx:      1988      Jef Poskanzer
-pbmtowbmp:     1999      Terje Sannum
-pbmtox10bm:    1988      Jef Poskanzer
-pbmtoxbm:      1988      Jef Poskanzer
-pbmtoybm:      1991      Jamie Zawinski and Jef Poskanzer
-pbmtozinc:     1988      James Darrell McCauley, Jef Poskanzer
-pbmupc:        1988      Jef Poskanzer
-pcxtoppm:      1990      Michael Davidson
-pgmbentley:    1990      Wilson Bent
-pgmcrater:     1989      John Walker
-pgmedge:       1989      Jef Poskanzer
-pgmenhance:    1989-1991 Jef Poskanzer
-pgmhist:       1989      Jef Poskanzer
-pgmkernel:     1992      Alberto Accomazzi, Smithsonian Astrophysical Observatory
-pgmnoise:      1993      Frank Neumann
-pgmnorm:       1989-1991 Jef Poskanzer
-pgmramp:       1989      Jef Poskanzer
-pgmslice:      2000      Jos Dingjan
-pgmtexture:    1991      Texas Agricultural Experiment Station, James Darrell McCauley
-pgmtofs:       1991      Jef Poskanzer
-pgmtolispm:    1991      Jamie Zawinski and Jef Poskanzer
-pgmtopbm:      1989      Jef Poskanzer
-pgmtoppm:      1991      Jef Poskanzer
-pi1toppm:      1991      Steve Belczy and Jef Poskanzer
-pi3topbm:      1988      David Beckemeyer and Diomidis D. Spinellis
-picttoppm:     1989-1993 George Phillips
-pjtoppm:       1990      Christos Zoulas
-pngtopnm:      1995-1998 Alexander Lehmann, Willem van Schaik
-pnmalias:      1992      Alberto Accomazzi, Smithsonian Astrophysical Observatory
-pnmarith:      1989-1991 Jef Poskanzer
-pnmcat:        1989-1991 Jef Poskanzer
-pnmcomp:       1992      David Koblas
-pnmconvol:     1989-1995 Jef Poskanzer, Mike Burns
-pnmcrop:       1988      Jef Poskanzer
-pnmcut:        1989      Jef Poskanzer
-pnmdepth:      1989-1991 Jef Poskanzer
-pnmenlarge:    1989      Jef Poskanzer
-pnmfile:       1991      Jef Poskanzer
-pnmflip:       1989      Jef Poskanzer
-pnmgamma:      1991      Jef Poskanzer and Bill Davidson
-pnmhisteq:     1995      John Walker
-pnmhistmap:    1993      Wilson H. Bent, Jr
-pnmindex:      1991      Jef Poskanzer
-pnminterp:     1998-2000 Russell Marks
-pnminterp-gen: 1998-2000 Russell Marks
-pnminvert:     1989      Jef Poskanzer
-pnmmargin:     1991      Jef Poskanzer
-pnmmontage:    2000      Ben Olmstead
-pnmnlfilt:     1993      Graeme W. Gill
-pnmnoraw:      1991      Jef Poskanzer
-pnmpad:        1989-1990 Jef Poskanzer, Angus Duggan
-pnmpaste:      1989      Jef Poskanzer
-pnmpsnr:       1994-2000 Ullrich Hafner
-pnmrotate:     1989-1991 Jef Poskanzer
-pnmscale:      1989-1991 Jef Poskanzer
-pnmscalefixed: 1989-1991 Jef Poskanzer
-pnmshear:      1989-1991 Jef Poskanzer
-pnmsmooth:     1984      Mike Burns
-pnmsplit:      2000      Bryan Henderson
-pnmtile:       1989      Jef Poskanzer
-pnmtoddif:     1992      Digital Equipment Corporation, Burkhard Neidecker-Lutz
-pnmtofiasco:   1994-2000 Ullrich Hafner
-pnmtofits:     1989      Wilson H. Bent
-pnmtojbig:     2000      Markus Kuhn
-pnmtojpeg:     1991-2001 Thomas G. Lane, Bryan Henderson
-pnmtopalm:     1995-2000 Ian Goldberg, Bill Janssen
-pnmtoplainpnm: 1991      Jef Poskanzer
-pnmtopng:      1995-1998 Alexander Lehmann, Willem van Schaik
-pnmtops:       1989      Jef Poskanzer
-pnmtorast:     1989-1991 Jef Poskanzer
-pnmtorle:      1994      Minnesota Supercomputer Center, Inc, Wes Barris
-pnmtosgi:      1994      Ingo Wilken
-pnmtosir:      1991      Marvin Landis
-pnmtotiff:     1990      Sun Microsystems, Inc, Jef Poskanzer
-pnmtotiffcmyk: 1999      Andrew Cooke (Jara Software)
-pnmtoxwd:      1989-1991 Jef Poskanzer
-ppm3d:         1989      Jef Poskanzer
-ppmbrighten:   1989-1990 Jef Poskanzer, Brian Moffet
-ppmchange:     1991      Wilson H. Bent, Jr
-ppmcie:        1995      John Walker
-ppmcolormask:  2000      Bryan Henderson
-ppmdim:        1993      Frank Neumann
-ppmdist:       1993      Dan Stromberg
-ppmdither:     1991      Christos Zoulas
-ppmfade:       1994      Minnesota Supercomputer Center, Inc, Wes Barris
-ppmflash:      1993      Frank Neumann
-ppmforge:      1989      John Walker
-ppmhist:       1989      Jef Poskanzer
-ppmlabel:      1995      John Walker
-ppmmake:       1989      Jef Poskanzer
-ppmmix:        1993      Frank Neumann
-ppmnorm:       1989-1991 Jef Poskanzer, Wilson H. Bent, Jr
-ppmntsc:       1993      Minnesota Supercomputer Center, Inc, Wes Barris
-ppmpat:        1989-1991 Jef Poskanzer
-ppmquant:      1989-1991 Jef Poskanzer
-ppmquantall:   1991      Jef Poskanzer
-ppmqvga:       1991-1992 Bill Davidsen, Lyle Rains
-ppmrainbow:	   2001      Arjen Bax, Bryan Henderson
-ppmrelief:     1990      Wilson H. Bent, Jr
-ppmshadow:     1997      John Walker
-ppmshift:      1993      Frank Neumann
-ppmspread:     1993      Frank Neumann
-ppmtoacad:     1991      John Walker
-ppmtobmp:      1992      David W. Sanderson
-ppmtoeyuv:     1995      The Regents of the University of California
-ppmtoicr:      1990      Kanthan Pillay
-ppmtoilbm:     1989      Jef Poskanzer
-ppmtoleaf:     1994      Bill O'Donnell
-ppmtolj:       2000      Jonathan Melvin
-ppmtomap:      1989      Jef Poskanzer
-ppmtomitsu:    1992-1993 S.Petra Zeidler
-ppmtompeg:     1995      The Regents of the University of California
-ppmtoneo:      2001      Teemu Hukkanen
-ppmtopcx:      1994      Ingo Wilken
-ppmtopgm:      1989      Jef Poskanzer
-ppmtopi1:      1991      Jef Poskanzer and Steve Belczyk
-ppmtopict:     1990      Ken Yap
-ppmtopj:       1990      Christos Zoulas
-ppmtopuzz:     1991      Jef Poskanzer
-ppmtorgb3:     1991      Jef Poskanzer
-ppmtosixel:    1991      Rick Vinci
-ppmtotga:      1989-1991 Mark Shand and Jef Poskanzer
-ppmtouil:      1990      Mark W. Snitily, Jef Poskanzer
-ppmtowinicon:  2000      Lee Benfield
-ppmtoxpm:      1990      Mark W. Snitily
-ppmtoyuv:      1987-1991 Abekas Video Systems Inc, DHD PostImage Inc
-ppmtoyuvsplit: 1993      Andre Beck
-ppmtv:         1993      Frank Neumann
-psidtopgm:     1989      Jef Poskanzer
-pstopnm:       1992      Smithsonian Astrophysical Observatory, Alberto Accomazzi
-qrttoppm:      1989      Jef Poskanzer
-rasttopnm:     1989-1991 Jef Poskanzer
-rawtopgm:      1989      Jef Poskanzer
-rawtoppm:      1991      Jef Poskanzer
-rgb3toppm:     1991      Jef Poskanzer
-rletopnm:      1994      Minnesota Supercomputer Center, Inc, Wes Barris
-sbigtopgm:     1998      John Walker
-sgitopnm:      1994      Ingo Wilken
-sirtopnm:      1991      Marvin Landis
-sldtoppm:      1991      John Walker
-spctoppm:      1991      Jef Poskanzer and Steve Belczyk
-sputoppm:      1991      Jef Poskanzer and Steve Belczyk
-tgatoppm:      1989      Jef Poskanzer
-tifftopnm:     1990      Sun Microsystems, Inc, Jef Poskanzer
-thinkjettopbm: 2001      W. Eric Norum
-wbmptopbm:     1999      Terje Sannum
-winicontoppm:  2000      Lee Benfield
-xbmtopbm:      1988      Jef Poskanzer
-ximtoppm:      1991      Jef Poskanzer
-xpmtoppm:      1991      Jef Poskanzer
-xvminitoppm:   1993      Ingo Wilken
-xwdtopnm:      1989-1991 Jef Poskanzer
-ybmtopbm:      1988      Jamie Zawinski and Jef Poskanzer
-yuvsplittoppm: 1993      Marcel Wijkstra
-yuvtoppm:      1987-1991 Jef Poskanzer, Abekas Video Systems Inc., DHD PostImage Inc.
-zeisstopnm:    1993      Oliver Trepte"
+COPYRIGHT="2001 411toppm: Steve Allen
+1991 anytopnm: Jef Poskanzer
+1989 asciitopgm: Wilson H. Bent, Jr
+1991 atktopbm: Bill Janssen
+1993 bioradtopgm: Oliver Trepte
+1992 bmptoppm: David W. Sanderson
+1988 brushtopbm: Jef Poskanzer
+1989 cmuwmtopbm: Jef Poskanzer
+1995 eyuvtoppm: The Regents of the University of California
+1994-2000 fiascotopnm: Ullrich Hafner
+1989 fitstopnm: Jef Poskanzer
+1989 fstopgm: Jef Poskanzer
+1989 g3topbm: Paul Haeberli
+1988 gemtopbm: Diomidis D. Spinellis
+1988 gemtopnm: Diomidis D. Spinellis
+1990-1993 giftopnm: David Koblas
+1990 gouldtoppm: Stephen P. Lesniewski
+1989 hipstopgm: Jef Poskanzer
+1988 icontopbm: Jef Poskanzer
+1989 ilbmtoppm: Jef Poskanzer
+1989 imgtoppm: Jef Poskanzer
+2000 jbigtopnm: Markus Kuhn
+1991-2000 jpegtopnm: Thomas G. Lane, Bryan Henderson
+1994 leaftoppm: Bill O'Donnell
+1988 lispmtopgm: Jef Poskanzer, Jamie Zawinski
+1988 macptopbm: Jef Poskanzer
+1999 mdatopbm: John Elliott
+1989 mgrtopbm: Jef Poskanzer
+1989 mtvtoppm: Jef Poskanzer
+2001 neotoppm: Teemu Hukkanen
+1995-2000 palmtopnm: Ian Goldberg, Bill Janssen
+1989 pamcut: Jef Poskanzer
+1991 pamfile: Jef Poskanzer
+1990 pamoil: Wilson Bent
+1989-1990 pbmclean: Jef Poskanzer, Angus Duggan
+1988-1991 pbmlife: Jef Poskanzer
+1988 pbmmake: Jef Poskanzer
+1989-1991 pbmmask: Jef Poskanzer
+1998 pbmpage: Tim Norman
+1989-1990 pbmpscale: Jef Poskanzer, Angus Duggan
+1989 pbmreduce: Jef Poskanzer
+1991 pbmtext: Jef Poskanzer
+1990-1994 pbmto10x: Ken Yap
+1988-1992 pbmtoascii: Jef Poskanzer
+1991 pbmtoatk: Bill Janssen
+1989 pbmtobbnbg: Mike Parker
+1989 pbmtocmuwm: Jef Poskanzer
+1988 pbmtoepsi: Jef Poskanzer
+1990 pbmtoepson: Jef Poskanzer, John Tiller
+1989 pbmtog3: Paul Haeberli
+1988 pbmtogem: Jef Poskanzer, David Beckemeyer
+1988-1989 pbmtogo: Jef Poskanzer, Michael Haberler, Bo Thide'
+1988 pbmtoicon: Jef Poskanzer
+1988 pbmtolj: Jef Poskanzer, Michael Haberler
+1988 pbmtomacp: Douwe vand der Schaaf
+1999 pbmtomda: John Elliott
+1989 pbmtomgr: Jef Poskanzer
+2001 pbmtonokia: OMS Open Media System GmbH, Tim R<FC>hsen
+1989-1990 pbmtopgm: Jef Poskanzer, Angus Duggan
+1988 pbmtopi3: David Beckemeyer and Jef Poskanzer
+1990 pbmtoplot: Arthur David Olson
+1998 pbmtoppa: Tim Norman
+2001 pbmtopsg3: Kristof Koehler
+1988 pbmtoptx: Jef Poskanzer
+1999 pbmtowbmp: Terje Sannum
+1988 pbmtox10bm: Jef Poskanzer
+1988 pbmtoxbm: Jef Poskanzer
+1991 pbmtoybm: Jamie Zawinski and Jef Poskanzer
+1988 pbmtozinc: James Darrell McCauley, Jef Poskanzer
+1988 pbmupc: Jef Poskanzer
+1990 pcxtoppm: Michael Davidson
+1990 pgmbentley: Wilson Bent
+1989 pgmcrater: John Walker
+1989 pgmedge: Jef Poskanzer
+1989-1991 pgmenhance: Jef Poskanzer
+1989 pgmhist: Jef Poskanzer
+1992 pgmkernel: Alberto Accomazzi, Smithsonian Astrophysical Observatory
+1993 pgmnoise: Frank Neumann
+1989-1991 pgmnorm: Jef Poskanzer
+1989 pgmramp: Jef Poskanzer
+2000 pgmslice: Jos Dingjan
+1991 pgmtexture: Texas Agricultural Experiment Station, James Darrell McCauley
+1991 pgmtofs: Jef Poskanzer
+1991 pgmtolispm: Jamie Zawinski and Jef Poskanzer
+1989 pgmtopbm: Jef Poskanzer
+1991 pgmtoppm: Jef Poskanzer
+1991 pi1toppm: Steve Belczy and Jef Poskanzer
+1988 pi3topbm: David Beckemeyer and Diomidis D. Spinellis
+1989-1993 picttoppm: George Phillips
+1990 pjtoppm: Christos Zoulas
+1995-1998 pngtopnm: Alexander Lehmann, Willem van Schaik
+1992 pnmalias: Alberto Accomazzi, Smithsonian Astrophysical Observatory
+1989-1991 pnmarith: Jef Poskanzer
+1989-1991 pnmcat: Jef Poskanzer
+1992 pnmcomp: David Koblas
+1989-1995 pnmconvol: Jef Poskanzer, Mike Burns
+1988 pnmcrop: Jef Poskanzer
+1989 pnmcut: Jef Poskanzer
+1989-1991 pnmdepth: Jef Poskanzer
+1989 pnmenlarge: Jef Poskanzer
+1991 pnmfile: Jef Poskanzer
+1989 pnmflip: Jef Poskanzer
+1991 pnmgamma: Jef Poskanzer and Bill Davidson
+1995 pnmhisteq: John Walker
+1993 pnmhistmap: Wilson H. Bent, Jr
+1991 pnmindex: Jef Poskanzer
+1998-2000 pnminterp: Russell Marks
+1998-2000 pnminterp-gen: Russell Marks
+1989 pnminvert: Jef Poskanzer
+1991 pnmmargin: Jef Poskanzer
+2000 pnmmontage: Ben Olmstead
+1993 pnmnlfilt: Graeme W. Gill
+1991 pnmnoraw: Jef Poskanzer
+1989-1990 pnmpad: Jef Poskanzer, Angus Duggan
+1989 pnmpaste: Jef Poskanzer
+1994-2000 pnmpsnr: Ullrich Hafner
+1989-1991 pnmrotate: Jef Poskanzer
+1989-1991 pnmscale: Jef Poskanzer
+1989-1991 pnmscalefixed: Jef Poskanzer
+1989-1991 pnmshear: Jef Poskanzer
+1984 pnmsmooth: Mike Burns
+2000 pnmsplit: Bryan Henderson
+1989 pnmtile: Jef Poskanzer
+1992 pnmtoddif: Digital Equipment Corporation, Burkhard Neidecker-Lutz
+1994-2000 pnmtofiasco: Ullrich Hafner
+1989 pnmtofits: Wilson H. Bent
+2000 pnmtojbig: Markus Kuhn
+1991-2001 pnmtojpeg: Thomas G. Lane, Bryan Henderson
+1995-2000 pnmtopalm: Ian Goldberg, Bill Janssen
+1991 pnmtoplainpnm: Jef Poskanzer
+1995-1998 pnmtopng: Alexander Lehmann, Willem van Schaik
+1989 pnmtops: Jef Poskanzer
+1989-1991 pnmtorast: Jef Poskanzer
+1994 pnmtorle: Minnesota Supercomputer Center, Inc, Wes Barris
+1994 pnmtosgi: Ingo Wilken
+1991 pnmtosir: Marvin Landis
+1990 pnmtotiff: Sun Microsystems, Inc, Jef Poskanzer
+1999 pnmtotiffcmyk: Andrew Cooke (Jara Software)
+1989-1991 pnmtoxwd: Jef Poskanzer
+1989 ppm3d: Jef Poskanzer
+1989-1990 ppmbrighten: Jef Poskanzer, Brian Moffet
+1991 ppmchange: Wilson H. Bent, Jr
+1995 ppmcie: John Walker
+2000 ppmcolormask: Bryan Henderson
+1993 ppmdim: Frank Neumann
+1993 ppmdist: Dan Stromberg
+1991 ppmdither: Christos Zoulas
+1994 ppmfade: Minnesota Supercomputer Center, Inc, Wes Barris
+1993 ppmflash: Frank Neumann
+1989 ppmforge: John Walker
+1989 ppmhist: Jef Poskanzer
+1995 ppmlabel: John Walker
+1989 ppmmake: Jef Poskanzer
+1993 ppmmix: Frank Neumann
+1989-1991 ppmnorm: Jef Poskanzer, Wilson H. Bent, Jr
+1993 ppmntsc: Minnesota Supercomputer Center, Inc, Wes Barris
+1989-1991 ppmpat: Jef Poskanzer
+1989-1991 ppmquant: Jef Poskanzer
+1991 ppmquantall: Jef Poskanzer
+1991-1992 ppmqvga: Bill Davidsen, Lyle Rains
+2001 ppmrainbow:	 Arjen Bax, Bryan Henderson
+1990 ppmrelief: Wilson H. Bent, Jr
+1997 ppmshadow: John Walker
+1993 ppmshift: Frank Neumann
+1993 ppmspread: Frank Neumann
+1991 ppmtoacad: John Walker
+1992 ppmtobmp: David W. Sanderson
+1995 ppmtoeyuv: The Regents of the University of California
+1990 ppmtoicr: Kanthan Pillay
+1989 ppmtoilbm: Jef Poskanzer
+1994 ppmtoleaf: Bill O'Donnell
+2000 ppmtolj: Jonathan Melvin
+1989 ppmtomap: Jef Poskanzer
+1992-1993 ppmtomitsu: S.Petra Zeidler
+1995 ppmtompeg: The Regents of the University of California
+2001 ppmtoneo: Teemu Hukkanen
+1994 ppmtopcx: Ingo Wilken
+1989 ppmtopgm: Jef Poskanzer
+1991 ppmtopi1: Jef Poskanzer and Steve Belczyk
+1990 ppmtopict: Ken Yap
+1990 ppmtopj: Christos Zoulas
+1991 ppmtopuzz: Jef Poskanzer
+1991 ppmtorgb3: Jef Poskanzer
+1991 ppmtosixel: Rick Vinci
+1989-1991 ppmtotga: Mark Shand and Jef Poskanzer
+1990 ppmtouil: Mark W. Snitily, Jef Poskanzer
+2000 ppmtowinicon: Lee Benfield
+1990 ppmtoxpm: Mark W. Snitily
+1987-1991 ppmtoyuv: Abekas Video Systems Inc, DHD PostImage Inc
+1993 ppmtoyuvsplit: Andre Beck
+1993 ppmtv: Frank Neumann
+1989 psidtopgm: Jef Poskanzer
+1992 pstopnm: Smithsonian Astrophysical Observatory, Alberto Accomazzi
+1989 qrttoppm: Jef Poskanzer
+1989-1991 rasttopnm: Jef Poskanzer
+1989 rawtopgm: Jef Poskanzer
+1991 rawtoppm: Jef Poskanzer
+1991 rgb3toppm: Jef Poskanzer
+1994 rletopnm: Minnesota Supercomputer Center, Inc, Wes Barris
+1998 sbigtopgm: John Walker
+1994 sgitopnm: Ingo Wilken
+1991 sirtopnm: Marvin Landis
+1991 sldtoppm: John Walker
+1991 spctoppm: Jef Poskanzer and Steve Belczyk
+1991 sputoppm: Jef Poskanzer and Steve Belczyk
+1989 tgatoppm: Jef Poskanzer
+1990 tifftopnm: Sun Microsystems, Inc, Jef Poskanzer
+2001 thinkjettopbm: W. Eric Norum
+1999 wbmptopbm: Terje Sannum
+2000 winicontoppm: Lee Benfield
+1988 xbmtopbm: Jef Poskanzer
+1991 ximtoppm: Jef Poskanzer
+1991 xpmtoppm: Jef Poskanzer
+1993 xvminitoppm: Ingo Wilken
+1989-1991 xwdtopnm: Jef Poskanzer
+1988 ybmtopbm: Jamie Zawinski and Jef Poskanzer
+1993 yuvsplittoppm: Marcel Wijkstra
+1987-1991 yuvtoppm: Jef Poskanzer, Abekas Video Systems Inc., DHD PostImage Inc.
+1993 zeisstopnm: Oliver Trepte"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="svn+http://svn.code.sf.net/p/netpbm/code/advanced#2294"
diff --git a/net-irc/quassel/quassel-0.10.0.recipe b/net-irc/quassel/quassel-0.10.0.recipe
index 50e844f26..104840041 100644
--- a/net-irc/quassel/quassel-0.10.0.recipe
+++ b/net-irc/quassel/quassel-0.10.0.recipe
@@ -1,24 +1,23 @@
 SUMMARY="A distributed IRC client"
-DESCRIPTION="
-Quassel IRC is a modern, cross-platform, distributed IRC client, meaning \
-that one (or multiple) client(s) can attach to and detach from a central \
-core -- much like the popular combination of screen and a text-based IRC \
-client such as WeeChat, but graphical.
+DESCRIPTION="Quassel IRC is a modern, cross-platform, distributed IRC client, \
+meaning that one (or multiple) client(s) can attach to and detach from a \
+central core -- much like the popular combination of screen and a text-based \
+IRC client such as WeeChat, but graphical.
 
 In addition to this unique feature, it aims to bring a pleasurable, \
 comfortable chatting experience to all major platforms (including Linux, \
 Windows, and Mac OS X as well as Android smartphones), making communication \
-with your peers not only convenient, but also easily available.
-"
+with your peers not only convenient, but also easily available."
 HOMEPAGE="http://quassel-irc.org"
-SOURCE_URI="http://quassel-irc.org/pub/quassel-0.10.0.tar.bz2"
-CHECKSUM_SHA256="68228ce23aa3a992add3d00cb1e8b4863d8ca64bea99c881edf6d16ff9ec7c23"
-REVISION="3"
+COPYRIGHT="2005-2014 The Quassel IRC Team"
 LICENSE="
 	GNU GPL v2
 	GNU GPL v3
 	"
-COPYRIGHT="2005-2014 The Quassel IRC Team"
+REVISION="3"
+SOURCE_URI="http://quassel-irc.org/pub/quassel-0.10.0.tar.bz2"
+CHECKSUM_SHA256="68228ce23aa3a992add3d00cb1e8b4863d8ca64bea99c881edf6d16ff9ec7c23"
+PATCHES="quassel-0.9.2.patchset"
 
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -40,9 +39,7 @@ REQUIRES="
 	libqt4${secondaryArchSuffix} >= 4.8
 	lib:libz${secondaryArchSuffix}
 	"
-PATCHES="
-	quassel-0.9.2.patchset
-	"
+
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++${secondaryArchSuffix}
diff --git a/net-irc/quassel/quassel-0.9.2.recipe b/net-irc/quassel/quassel-0.9.2.recipe
index 1c96ab388..b676eea1a 100644
--- a/net-irc/quassel/quassel-0.9.2.recipe
+++ b/net-irc/quassel/quassel-0.9.2.recipe
@@ -1,23 +1,22 @@
-SUMMARY="Quassel IRC."
-DESCRIPTION="
-Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that \
-one (or multiple) client(s) can attach to and detach from a central core -- \
-much like the popular combination of screen and a text-based IRC client such \
-as WeeChat, but graphical. In addition to this unique feature, we aim to bring \
-a pleasurable, comfortable chatting experience to all major platforms \
-(including Linux, Windows, and MacOS X as well as Android smartphones), making \
-communication with your peers not only convenient, but also ubiquitous \
-available.
-"
+SUMMARY="A distributed IRC client"
+DESCRIPTION="Quassel IRC is a modern, cross-platform, distributed IRC client, \
+meaning that one (or multiple) client(s) can attach to and detach from a \
+central core -- much like the popular combination of screen and a text-based \
+IRC client such as WeeChat, but graphical.
+
+In addition to this unique feature, it aims to bring a pleasurable, \
+comfortable chatting experience to all major platforms (including Linux, \
+Windows, and Mac OS X as well as Android smartphones), making communication \
+with your peers not only convenient, but also easily available."
 HOMEPAGE="http://quassel-irc.org"
-SOURCE_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2"
-CHECKSUM_SHA256="f04d01602509c1d950602502e5f51aba47d99c73a9c70e77c563bb7749fc53c0"
-REVISION="3"
+COPYRIGHT="2005-2009 The Quassel IRC Team"
 LICENSE="
 	GNU GPL v2
 	GNU GPL v3
 	"
-COPYRIGHT="2005-2009, the Quassel IRC Team"
+REVISION="3"
+SOURCE_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2"
+CHECKSUM_SHA256="f04d01602509c1d950602502e5f51aba47d99c73a9c70e77c563bb7749fc53c0"
 
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -34,7 +33,6 @@ PROVIDES="
 	cmd:quasselcore${secondaryArchSuffix}
 	cmd:quasselclient${secondaryArchSuffix}
 	"
-
 REQUIRES="
 	haiku${secondaryArchSuffix}
 	lib:libQtCore$secondaryArchSuffix >= 4.8
@@ -49,7 +47,6 @@ BUILD_PREREQUIRES="
 	cmd:moc$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	"	
-        
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libQtCore$secondaryArchSuffix >= 4.8
diff --git a/www-client/qupzilla/qupzilla-1.4.x.recipe b/www-client/qupzilla/qupzilla-1.4.x.recipe
index 51438ebd7..b0531da70 100644
--- a/www-client/qupzilla/qupzilla-1.4.x.recipe
+++ b/www-client/qupzilla/qupzilla-1.4.x.recipe
@@ -1,20 +1,18 @@
-SUMMARY="A lightweight Qt WebKit web browser."
-DESCRIPTION="
-QupZilla is a lightweight multiplatform web browser based on libqtwebkit.
-It provides:
-- A unified interface for bookmarks, history and RSS reading.
-- A themeable interface.
-- Integrated AdBlock.
-- Speed Dial.
-- Multiplatform support.
-"
+SUMMARY="A lightweight QtWebKit browser"
+DESCRIPTION="QupZilla is a free and open-source web browser, \
+intended for general users. It allows seamless integration with \
+users' desktop environments and has several distinguishing features \
+positively received by reviewers:
+ - A unified interface for bookmarks, history and RSS reading.
+ - A themeable interface.
+ - Integrated Adblock.
+ - Speed dial."
 HOMEPAGE="http://www.qupzilla.com"
-
-SOURCE_URI="git://github.com/QupZilla/qupzilla.git#4f3aba95ff4194c9b756d196f54d50ff30161f46"
-
-REVISION="1"
-LICENSE="GNU GPL v3"
 COPYRIGHT="2010-2013 David Rosca"
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="git://github.com/QupZilla/qupzilla.git#4f3aba95ff4194c9b756d196f54d50ff30161f46"
+PATCHES="qupzilla-1.4.x.patchset"
 
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -26,7 +24,6 @@ PROVIDES="
 	qupzilla${secondaryArchSuffix} = $portVersion
 	app:qupzilla${secondaryArchSuffix} = $portVersion
 	"
-
 # TODO: update requirements to be more specific about which Qt 
 # libraries are required.	
 REQUIRES="
@@ -38,18 +35,13 @@ BUILD_PREREQUIRES="
 	cmd:qmake${secondaryArchSuffix}
 	cmd:make
 	cmd:g++${secondaryArchSuffix}
-	"
-        
+	"  
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	openssl${secondaryArchSuffix}_devel
 	qtcore${secondaryArchSuffix} >= 4.8.0
 	qtcore${secondaryArchSuffix}_devel >= 4.8.0
 	"
-        
-PATCHES="
-	qupzilla-1.4.x.patchset
-	"
 
 BUILD()
 {	
diff --git a/www-client/qupzilla/qupzilla-1.7.x.recipe b/www-client/qupzilla/qupzilla-1.7.x.recipe
index fc9e24561..134992f71 100644
--- a/www-client/qupzilla/qupzilla-1.7.x.recipe
+++ b/www-client/qupzilla/qupzilla-1.7.x.recipe
@@ -8,12 +8,12 @@ positively received by reviewers:
  - Integrated Adblock.
  - Speed dial."
 HOMEPAGE="http://www.qupzilla.com"
+COPYRIGHT="2010-2014 David Rosca"
+LICENSE="GNU GPL v3"
+REVISION="6"
 SOURCE_URI="https://github.com/QupZilla/qupzilla/archive/eee3895f6954617f8eb1f15df18b33a9745491ba.zip"
 CHECKSUM_SHA256="1ed2b9f1edd6908349d047e932114e7a0215c6dfe6290fe4a6f3bc1a4dd05e25"
 SOURCE_DIR="qupzilla-eee3895f6954617f8eb1f15df18b33a9745491ba"
-REVISION="6"
-LICENSE="GNU GPL v3"
-COPYRIGHT="2010-2014 David Rosca"
 
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -25,7 +25,6 @@ PROVIDES="
 	qupzilla${secondaryArchSuffix} = $portVersion
 	app:QupZilla${secondaryArchSuffix} = $portVersion
 	"
-
 # TODO: update requirements to be more specific about which Qt 
 # libraries are required.	
 REQUIRES="
@@ -40,7 +39,6 @@ BUILD_PREREQUIRES="
 	cmd:g++${secondaryArchSuffix}
 	cmd:pkg_config$secondaryArchSuffix
 	"
-        
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8.0
diff --git a/www-client/qupzilla/qupzilla-1.8.6.recipe b/www-client/qupzilla/qupzilla-1.8.6.recipe
index 7285e3f4e..0c195426b 100644
--- a/www-client/qupzilla/qupzilla-1.8.6.recipe
+++ b/www-client/qupzilla/qupzilla-1.8.6.recipe
@@ -8,12 +8,13 @@ positively received by reviewers:
  - Integrated Adblock.
  - Speed dial."
 HOMEPAGE="http://www.qupzilla.com"
+COPYRIGHT="2010-2015 David Rosca"
+LICENSE="GNU GPL v3"
+REVISION="1"
 SOURCE_URI="https://github.com/QupZilla/qupzilla/releases/download/v$portVersion/QupZilla-$portVersion.tar.xz"
 CHECKSUM_SHA256="aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5"
 SOURCE_DIR="QupZilla-$portVersion"
-REVISION="1"
-LICENSE="GNU GPL v3"
-COPYRIGHT="2010-2015 David Rosca"
+PATCHES="qupzilla-1.8.x-system_certificates.patchset"
 
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -27,7 +28,6 @@ PROVIDES="
 	qupzilla$secondaryArchSuffix = $portVersion
 	app:QupZilla$secondaryArchSuffix = $portVersion
 	"
-
 # TODO: update requirements to be more specific about which Qt
 # libraries are required.
 REQUIRES="
@@ -42,7 +42,6 @@ BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8.0
@@ -51,8 +50,6 @@ BUILD_REQUIRES="
 	devel:libexecinfo$secondaryArchSuffix
 	"
 
-PATCHES="qupzilla-1.8.x-system_certificates.patchset"
-
 BUILD()
 {
 	export QUPZILLA_PREFIX=$appsDir/QupZilla