Merge pull request #497 from DarkmatterVale/master

Fix HOMEPAGE, COPYRIGHT, and LICENSE blocks

app-admin/keepassx/keepassx-2.0a5.recipe

@@ -13,15 +13,13 @@ KeePassX offers a little utility for secure password generation. The password \
 generator is very customizable, fast and easy to use. Especially someone who \
 generates passwords frequently will appreciate this feature."
 HOMEPAGE="http://www.keepassx.org/"
-COPYRIGHT="
+COPYRIGHT="2010-2012 Felix Geyer
-	2010-2012, Felix Geyer
+	2011-2012 Florian Geyer
-	2011-2012, Florian Geyer
+	2012 Tobias Tangemann
-	2012, Tobias Tangemann
+	2007 Trolltech ASA
-	2007, Trolltech ASA
+	2012 Intel Corporation
-	2012, Intel Corporation
+	2012 Nokia Corporation and/or its subsidiary(-ies)
-	2012, Nokia Corporation and/or its subsidiary(-ies)
+	2000-2008 Tom Sato"
-	2000-2008, Tom Sato
-	"
 LICENSE="GNU GPL v2"
 REVISION="2"
 SOURCE_URI="git+https://github.com/keepassx/keepassx.git#2.0-alpha5"

app-admin/keepassx/keepassx-2.0a6.recipe

@@ -13,15 +13,13 @@ KeePassX offers a little utility for secure password generation. The password \
 generator is very customizable, fast and easy to use. Especially someone who \
 generates passwords frequently will appreciate this feature."
 HOMEPAGE="http://www.keepassx.org/"
-COPYRIGHT="
+COPYRIGHT="2010-2012 Felix Geyer
-	2010-2012, Felix Geyer
+	2011-2012 Florian Geyer
-	2011-2012, Florian Geyer
+	2012 Tobias Tangemann
-	2012, Tobias Tangemann
+	2007 Trolltech ASA
-	2007, Trolltech ASA
+	2012 Intel Corporation
-	2012, Intel Corporation
+	2012 Nokia Corporation and/or its subsidiary(-ies)
-	2012, Nokia Corporation and/or its subsidiary(-ies)
+	2000-2008 Tom Sato"
-	2000-2008, Tom Sato
-	"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/keepassx/keepassx/archive/2.0-alpha6.zip"

app-admin/pwgen/pwgen-2.06.recipe

@@ -15,9 +15,8 @@ password, and then quickly erase the screen. This prevents someone from being \
 able to 'shoulder surf' the user's chosen password."
 HOMEPAGE="http://sourceforge.net/projects/pwgen"
 COPYRIGHT="2001-2006 by Theodore Ts'o
-	2001-2003  Christophe Devine
+	2001-2003 Christophe Devine
-	2005 by Olivier Guerrier
+	2005 by Olivier Guerrier"
-	"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/pwgen/files/pwgen/2.06/pwgen-2.06.tar.gz"

app-arch/fastjar/fastjar-0.98.recipe

@@ -6,7 +6,7 @@ in Java which makes it dog slow.  Since FastJar is written in C, it can create \
 the same .jar file as Sun's tool in a fraction of the time."
 HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
 COPYRIGHT="1999-2001 Bryan Burns, Cory Jon Hollingsworth, Matthias Klose (documentation)
-	2007-2009  Dalibor Topic"
+	2007-2009 Dalibor Topic"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://download.savannah.gnu.org/releases/fastjar/fastjar-0.98.tar.gz"

app-arch/lha/lha-1.14i.recipe

@@ -2,9 +2,9 @@ SUMMARY="Tools to archive files using LZSS and Huffman compression (.lzh files)"
 DESCRIPTION="LHA archives are often used on Amiga computers. The compression \
 is rather effective and the unpacking is fast."
 HOMEPAGE="http://sourceforge.jp/projects/lha/"
-COPYRIGHT="1991, Masaru Oki
+COPYRIGHT="1991 Masaru Oki
-	1993-1995, Nobutaka Watazaki
+	1993-1995 Nobutaka Watazaki
-	2000, Tsugio Okamoto et al."
+	2000 Tsugio Okamoto et al."
 LICENSE="lha"
 REVISION="2"
 SOURCE_URI="http://jaist.dl.sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz"

app-benchmarks/bonnie++/bonnie++-1.03e.recipe

@@ -15,8 +15,8 @@ you can use it on full file systems). It can show why comparing the speed of \
 Windows at the start of a hard drive to Linux at the end of the hard drive \
 (typical dual-boot scenario) isn't a valid comparison."
 HOMEPAGE="http://www.coker.com.au/bonnie++/"
-COPYRIGHT="1990, Tim Bray
+COPYRIGHT="1990 Tim Bray
-	1999, Russell Coker"
+	1999 Russell Coker"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://www.coker.com.au/bonnie++/bonnie++-1.03e.tgz"

app-benchmarks/ltp/ltp-20140422.recipe

@@ -7,9 +7,8 @@ testsuite contains a collection of tools for testing the Linux kernel and \
 related features."
 HOMEPAGE="http://linux-test-project.github.io/"
 COPYRIGHT="2002-2004 Intel Corporation
-	2004, QUALCOMM Inc.
+	2004 QUALCOMM Inc.
-	2004-2005 Bull S.A.
+	2004-2005 Bull S.A."
-	"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/linux-test-project/ltp/archive/20140422.tar.gz"

app-benchmarks/vttest/vttest-20140305.recipe

@@ -9,8 +9,7 @@ Additional tests (past version 1.7) are provided for analysis of vt220, vt420 \
 terminals, as well as variants of xterm."
 HOMEPAGE="http://invisible-island.net/vttest/vttest.html"
 COPYRIGHT="1983-1985 Per Lindberg
-1996-2014 Thomas E. Dickey
+	1996-2014 Thomas E. Dickey"
-"
 LICENSE="BSD (3-clause)"
 REVISION="1"
 SOURCE_URI="ftp://invisible-island.net/vttest/vttest.tar.gz"

app-office/multitalk/multitalk-1.4.recipe

@@ -4,10 +4,8 @@ on a grid instead of linearly. Slides can have any size (bigger or smaller \
 than the screen, and you can move in both directions between them. Hyperlinks \
 are also possible."
 HOMEPAGE="https://github.com/JohannesBuchner/multitalk"
-COPYRIGHT="
+COPYRIGHT="2006-2008 David Ingram
-	2006-2008 David Ingram
+	2010 Johannes Buchner"
-	2010 Johannes Buchner
-	"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/JohannesBuchner/multitalk/archive/master.zip"

app-shells/zsh/zsh-5.0.7.recipe

@@ -4,7 +4,7 @@ is also a powerful scripting language. Many of the useful features of \
 bash, ksh, and tcsh were incorporated into zsh; many original features \
 were added."
 HOMEPAGE="http://www.zsh.org"
-COPYRIGHT="1992-2014, Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
+COPYRIGHT="1992-2014 Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
 Andrew Main, Peter Stephenson, Sven Wishnowsky, and others"
 LICENSE="ZSH"
 REVISION="2"

app-shells/zsh/zsh-5.1.1.recipe

@@ -4,7 +4,7 @@ is also a powerful scripting language. Many of the useful features of \
 bash, ksh, and tcsh were incorporated into zsh; many original features \
 were added."
 HOMEPAGE="http://zsh.sourceforge.net"
-COPYRIGHT="1992-2014, Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
+COPYRIGHT="1992-2014 Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
 Andrew Main, Peter Stephenson, Sven Wishnowsky, and others"
 LICENSE="ZSH"
 REVISION="1"

app-shells/zsh/zsh-5.2.recipe

@@ -4,7 +4,7 @@ is also a powerful scripting language. Many of the useful features of \
 bash, ksh, and tcsh were incorporated into zsh; many original features \
 were added."
 HOMEPAGE="http://zsh.sourceforge.net"
-COPYRIGHT="1992-2014, Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
+COPYRIGHT="1992-2014 Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
 Andrew Main, Peter Stephenson, Sven Wishnowsky, and others"
 LICENSE="ZSH"
 REVISION="1"

app-text/aiksaurus/aiksaurus-1.2.1.recipe

@@ -9,8 +9,7 @@ The core library itself is platform-independent. The principal language is \
 C++, with some use of Cocoa/ObjC++; wrappers are provided for C and Cocoa/ObjC."
 HOMEPAGE="http://aiksaurus.sourceforge.net"
 COPYRIGHT="2001-2002 Jared Davis
-	2001 Michael D. Pritchett
+	2001 Michael D. Pritchett"
-	"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://switch.dl.sourceforge.net/project/aiksaurus/aiksaurus/1.2.1/aiksaurus-1.2.1.tar.gz"

app-text/hunspell/hunspell-1.3.2.recipe

@@ -4,16 +4,12 @@ DESCRIPTION="
 	designed for languages with rich morphology and complex word compounding or
 	character encoding."
 HOMEPAGE="http://hunspell.sourceforge.net/"
-COPYRIGHT="
+COPYRIGHT="2007-2011 Hunspell developers et al.
-	2007-2011 Hunspell developers et al.
 	2002-2008 László Németh (Hunspell)
-	2001-2002 Kevin Hendricks (MySpell)
+	2001-2002 Kevin Hendricks (MySpell)"
-	"
+LICENSE="GNU GPL v2
-LICENSE="
-	GNU GPL v2
 	GNU LGPL v2.1
-	MPL v1.1
+	MPL v1.1"
-	"
 REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/hunspell/hunspell-1.3.2.tar.gz"
 CHECKSUM_SHA256="b4edd4a4ee944cb9f485b35473e46b729ed768e9d24da8e78e4c4c6ca56addbd"

app-text/libwpd/libwpd-0.10.0.recipe

@@ -4,15 +4,11 @@ libwpd is a C++ library designed to help process WordPerfect documents. It is \
 most commonly used to import WordPerfect documents into other word processors \
 (see below), but may be useful in other cases as well."
 HOMEPAGE="http://sourceforge.net/projects/libwpd/"
-COPYRIGHT="
+COPYRIGHT="William Lachance
-	William Lachance
 	Marc Maurer
-	Fridrich Strba
+	Fridrich Strba"
-	"
+LICENSE="MPL v2.0
-LICENSE="
+	GNU LGPL v2.1"
-	MPL v2.0
-	GNU LGPL v2.1
-	"
 REVISION="2"
 SOURCE_URI="http://prdownloads.sourceforge.net/libwpd/libwpd-$portVersion.tar.bz2"
 CHECKSUM_SHA256="f2bf5d65156a351ce404550dd822c8db8ab8740b393f61dba828d1b2cb33fe91"

app-text/libwpd/libwpd-0.9.9.recipe

@@ -4,15 +4,11 @@ DESCRIPTION="
 	is most commonly used to import WordPerfect documents into other word \
 	processors (see below), but may be useful in other cases as well."
 HOMEPAGE="http://libwpd.sourceforge.net"
-COPYRIGHT="
+COPYRIGHT="William Lachance
-	William Lachance
 	Marc Maurer
-	Fridrich Strba
+	Fridrich Strba"
-	"
+LICENSE="MPL v2.0
-LICENSE="
+	GNU LGPL v2.1"
-	MPL v2.0
-	GNU LGPL v2.1
-	"
 REVISION="2"
 SOURCE_URI="http://prdownloads.sourceforge.net/libwpd/libwpd-0.9.9.tar.gz"
 CHECKSUM_SHA256="6d894db0de312dbbef3359c14b967ee4d2bab4e70052c151f2a44dc39b0744b9"

app-text/libwpg/libwpg-0.2.2.recipe

@@ -3,16 +3,12 @@ DESCRIPTION="
 	libwpg project is a collection of library and tools to work with graphics \
 	in WPG (WordPerfect Graphics) format."
 HOMEPAGE="http://libwpg.sourceforge.net"
-COPYRIGHT="
+COPYRIGHT="Marc Oude Kotte
-	Marc Oude Kotte
 	Marc Maurer
 	Ariya Hidayat
-	Fridrich Strba
+	Fridrich Strba"
-	"
+LICENSE="MPL v2.0
-LICENSE="
+	GNU LGPL v2.1"
-	MPL v2.0
-	GNU LGPL v2.1
-	"
 REVISION="2"
 SOURCE_URI="http://downloads.sourceforge.net/project/libwpg/libwpg/libwpg-0.2.2/libwpg-0.2.2.tar.gz"
 CHECKSUM_SHA256="d5260dd46a9f2bb8ace90379b8afc47fe78f26048bb32abb982b900ef2fb2aa3"

app-text/libwpg/libwpg-0.3.0.recipe

@@ -3,16 +3,12 @@ DESCRIPTION="
 libwpg project is a collection of library and tools to work with graphics in \
 WPG (WordPerfect Graphics) format."
 HOMEPAGE="http://libwpg.sourceforge.net"
-COPYRIGHT="
+COPYRIGHT="Marc Oude Kotte
-	Marc Oude Kotte
 	Marc Maurer
 	Ariya Hidayat
-	Fridrich Strba
+	Fridrich Strba"
-	"
+LICENSE="MPL v2.0
-LICENSE="
+	GNU LGPL v2.1"
-	MPL v2.0
-	GNU LGPL v2.1
-	"
 REVISION="2"
 SOURCE_URI="http://prdownloads.sourceforge.net/libwpg/libwpg-$portVersion.tar.gz"
 CHECKSUM_SHA256="8fb8cb4229d4288a5363c78bab78811d94cf8e1e91a6a6b85941e43820561151"

app-text/xmlroff/xmlroff-0.6.2.recipe

@@ -4,8 +4,8 @@ aims to excel at DocBook formatting and that integrates easily with other \
 programs and with scripting languages."
 HOMEPAGE="http://xmlroff.org"
 COPYRIGHT="2001-2002 Sun Microsystems
-2007-2010 Meneith Consulting
+	2007-2010 Meneith Consulting
-2011-2012 Mentea"
+	2011-2012 Mentea"
 LICENSE="BSD (3-clause)"
 REVISION="2"
 SOURCE_URI="https://github.com/xmlroff/xmlroff/archive/v$portVersion.tar.gz"

dev-dotnet/pnet/pnet-0.8.0.recipe

@@ -7,8 +7,7 @@ COPYRIGHT="2001-2006 Southern Storm Software, Pty Ltd.
 	1984-2002 Free Software Foundation, Inc.
 	2003 Gopal.V
 	2002 FSF INDIA
-	2002 Richard Baumann
+	2002 Richard Baumann"
-	"
 LICENSE="GNU GPL v1"
 REVISION="1"
 SOURCE_URI="http://download.savannah.gnu.org/releases/dotgnu-pnet/pnet-0.8.0.tar.gz"

dev-embedded/cpcsdk/cpctools-0.3.0.recipe

@@ -6,14 +6,10 @@ build, run\" development cycle in line with the UNIX way of doing things.
 Some graphical tools are also provided, with a focus on debugging, analyzing, \
 reverse engineering and experimentations."
 HOMEPAGE="https://github.com/cpcsdk/cpctools"
-COPYRIGHT="
+COPYRIGHT="2005 Thierry Jouin
-	2005 Thierry Jouin
+	2008-2015 Romain Giot, Adrien Destugues, Quentin Carlier, Mauricio Muñoz Lucero"
-	2008-2015 Romain Giot, Adrien Destugues, Quentin Carlier, Mauricio Muñoz Lucero
+LICENSE="MIT
-"
+	GNU GPL v2"
-LICENSE="
-	MIT
-	GNU GPL v2
-"
 REVISION="3"
 SOURCE_URI="https://github.com/cpcsdk/cpctools/archive/ac9ebe65c7eb49bc1175050d4a6d912bbf5856f5.tar.gz"
 CHECKSUM_SHA256="a4bb951fb5866e2db4a87a4104187bb5265f3de089f3ed500b132d6cd0dd9942"

dev-embedded/lm4tools/lm4tools-0.1.3.recipe

@@ -3,10 +3,8 @@ DESCRIPTION="Some tools which enable multi-platform development on the TI \
 Stellaris Launchpad boards. The Stellaris Launchpad is a low cost development \
 board created by Texas Instruments that comes with an ARM Cortex-M4F processor."
 HOMEPAGE="https://github.com/utzig/lm4tools"
-COPYRIGHT="
+COPYRIGHT="2012 Fabio Utzig
-	2012 Fabio Utzig
+	2012 Peter Stuge"
-	2012 Peter Stuge
-	"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/utzig/lm4tools/archive/1cfd813779b9eb717b15b0a1814bde8338899ff9.tar.gz"

dev-embedded/sdcc/sdcc-3.4.0.recipe

@@ -8,12 +8,8 @@ Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim \
 the Microchip PIC16 and PIC18 targets. It can be retargeted for other \
 microprocessors."
 HOMEPAGE="http://sdcc.sourceforge.net"
-COPYRIGHT="
+COPYRIGHT="1999-2013 Sandeep Dutta"
-	1999-2013 Sandeep Dutta
+LICENSE="GNU GPL v2"
-	"
-LICENSE="
-	GNU GPL v2
-	"
 REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/sdcc/files/sdcc/3.4.0/sdcc-src-3.4.0.tar.bz2"
 CHECKSUM_SHA256="cf6af862b94d5f259f11afa0a1b86304f3047b3723a9df96f20dba869deb5bf9"

dev-embedded/sdcc/sdcc-3.5.0.recipe

@@ -7,12 +7,8 @@ Rabbit 3000A, TLCS-90) and STMicroelectronics STM8. Work is in progress on \
 supporting the Microchip PIC16 and PIC18 targets. It can be retargeted for \
 other microprocessors."
 HOMEPAGE="http://sdcc.sourceforge.net"
-COPYRIGHT="
+COPYRIGHT="1999-2013 Sandeep Dutta"
-	1999-2013 Sandeep Dutta
+LICENSE="GNU GPL v2"
-	"
-LICENSE="
-	GNU GPL v2
-	"
 REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/sdcc/files/sdcc/$portVersion/sdcc-src-$portVersion.tar.bz2"
 CHECKSUM_SHA256="f82978d1614244b22e093402c0a4de1f688a07c807b2980126c964eb3df85fa9"

dev-embedded/stm32flash/stm32flash-0.3.recipe

@@ -13,10 +13,8 @@ ST serial bootloader.
 * software reset the device when finished if -g not specified
 * resume already initialized connection (for when reset fails)"
 HOMEPAGE="http://code.google.com/p/stm32flash/"
-COPYRIGHT="
+COPYRIGHT="Geoffrey McRae
-	Geoffrey McRae
+	2012-2014 Tormod Volden"
-	2012-2014 Tormod Volden
-	"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://releases.stm32flash.googlecode.com/git/stm32flash-0.3.tar.gz"

dev-games/ode/ode-0.12.recipe

@@ -7,10 +7,8 @@ detection with friction. ODE is useful for simulating vehicles, objects in \
 virtual reality environments and virtual creatures."
 HOMEPAGE="http://www.ode.org/"
 COPYRIGHT="2001-2004 Russell L. Smith"
-LICENSE="
+LICENSE="GNU LGPL v3
-	GNU LGPL v3
+	BSD (3-clause)"
-	BSD (3-clause)
-	"
 REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/project/opende/ODE/0.12/ode-0.12.tar.bz2"
 CHECKSUM_SHA256="65c5315a42c725d2da01ea2c1b045583d54e0d1a95e3f7c062e5ba3769f5c350"

dev-lang/brexx/brexx-1.3.2.recipe

@@ -10,15 +10,11 @@ additions:
 * Support for running BRexx scripts from the desktop.
 * Additional functions and features."
 HOMEPAGE="http://www.verifiedlogic.com/"
-COPYRIGHT="
+COPYRIGHT="1991-1999 Be Incorporated
-	1991-1999, Be Incorporated
 	1999 Willy Langeveld
-	1999 Vassilis Vlachoudis
+	1999 Vassilis Vlachoudis"
-	"
+LICENSE="Public Domain
-LICENSE="
+	BSD (3-clause)"
-	Public Domain
-	BSD (3-clause)
-	"
 REVISION="1"
 SOURCE_URI="http://www.verifiedlogic.com/BeBRexx.zip"
 CHECKSUM_SHA256="0386a9f04e04a120af5785c034e254bbfedc24973e241fe744e6777b453c8055"

dev-lang/swi_prolog/swi_prolog-6.2.0.recipe

@@ -8,10 +8,8 @@ server, SGML, RDF, RDFS, developer tools (including an IDE with a GUI debugger \
 and GUI profiler), and extensive documentation."
 HOMEPAGE="http://www.swi-prolog.org/"
 COPYRIGHT="1985-2012, University of Amsterdam, VU University Amsterdam"
-LICENSE="
+LICENSE="GNU LGPL v2.1
-	GNU LGPL v2.1
+	SWI-Prolog"
-	SWI-Prolog
-	"
 REVISION="1"
 SOURCE_URI="http://www.swi-prolog.org/download/stable/src/pl-6.2.0.tar.gz"
 CHECKSUM_SHA256="be358eacd50bc7013cdcdd1aa763e67c5b1d40f7bbf1833a7a48c0123a6455a8"

dev-lang/swi_prolog/swi_prolog-6.6.6.recipe

@@ -8,10 +8,8 @@ server, SGML, RDF, RDFS, developer tools (including an IDE with a GUI debugger \
 and GUI profiler), and extensive documentation."
 HOMEPAGE="http://www.swi-prolog.org/"
 COPYRIGHT="1985-2012, University of Amsterdam, VU University Amsterdam"
-LICENSE="
+LICENSE="GNU LGPL v2.1
-	GNU LGPL v2.1
+	SWI-Prolog"
-	SWI-Prolog
-	"
 REVISION="1"
 SOURCE_URI="http://www.swi-prolog.org/download/stable/src/pl-6.6.6.tar.gz"
 CHECKSUM_SHA256="9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d"

dev-lang/yasm/yasm-1.1.0.recipe

@@ -10,13 +10,11 @@ Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for \
 assembly of NASM or GAS syntax code into Win32 or Win64 object files."
 HOMEPAGE="http://www.tortall.net/projects/yasm/"
 COPYRIGHT="2001-2010 Peter Johnson and other Yasm developers."
-LICENSE="
+LICENSE="Artistic
-	Artistic
 	BSD (2-clause)
 	BSD (3-clause)
 	GNU GPL v2
-	GNU LGPL v2
+	GNU LGPL v2"
-	"
 REVISION="2"
 SOURCE_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz"
 CHECKSUM_SHA256="e5d56b582f3d0c30ed5c4fc221063e4175602307ea645520889458133671c232"

dev-lang/yasm/yasm-1.2.0.recipe

@@ -10,13 +10,11 @@ Yasm can be easily integrated into Visual Studio 2005/2008 and 2010 for \
 assembly of NASM or GAS syntax code into Win32 or Win64 object files."
 HOMEPAGE="http://www.tortall.net/projects/yasm/"
 COPYRIGHT="2001-2011 Peter Johnson and other Yasm developers."
-LICENSE="
+LICENSE="Artistic
-	Artistic
 	BSD (2-clause)
 	BSD (3-clause)
 	GNU GPL v2
-	GNU LGPL v2
+	GNU LGPL v2"
-	"
 REVISION="3"
 SOURCE_URI="http://www.tortall.net/projects/yasm/releases/yasm-1.2.0.tar.gz"
 CHECKSUM_SHA256="768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31"

dev-libs/boehm_gc/boehm_gc-7.2d.recipe

@@ -7,8 +7,8 @@ deallocating memory that is no longer useful. The collector automatically \
 recycles memory when it determines that it can no longer be otherwise accessed."
 HOMEPAGE="http://www.hboehm.info/gc/"
 COPYRIGHT="1988, 1989 Hans-J. Boehm, Alan J. Demers
-	1991-1996 by Xerox Corporation.  All rights reserved.
+	1991-1996 Xerox Corporation.
-	1996-1999 by Silicon Graphics.  All rights reserved.
+	1996-1999 Silicon Graphics.
 	1999-2011 Hewlett-Packard Development Company, L.P."
 LICENSE="BOEHM"
 REVISION="2"

dev-libs/isl/isl-0.13.recipe

@@ -5,13 +5,11 @@ of the sets and relations may involve both parameters and existentially \
 quantified variables.  All computations are performed in exact integer \
 arithmetic using GMP."
 HOMEPAGE="http://isl.gforge.inria.fr"
-COPYRIGHT="
+COPYRIGHT="2011 Sven Verdoolaege
-	2011 Sven Verdoolaege
 	2008-2009 Katholieke Universiteit Leuven
 	2010-2011 INRIA Saclay
 	2012-2014 Ecole Normale Superieure
-	2006-2007, 2012 Universiteit Leiden
+	2006-2007, 2012 Universiteit Leiden"
-	"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="http://isl.gforge.inria.fr/isl-$portVersion.tar.bz2"

dev-libs/isl/isl-0.14.recipe

@@ -5,13 +5,11 @@ of the sets and relations may involve both parameters and existentially \
 quantified variables.  All computations are performed in exact integer \
 arithmetic using GMP."
 HOMEPAGE="http://isl.gforge.inria.fr"
-COPYRIGHT="
+COPYRIGHT="2011 Sven Verdoolaege
-	2011 Sven Verdoolaege
 	2008-2009 Katholieke Universiteit Leuven
 	2010-2011 INRIA Saclay
 	2012-2014 Ecole Normale Superieure
-	2006-2007, 2012 Universiteit Leiden
+	2006-2007, 2012 Universiteit Leiden"
-	"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="http://isl.gforge.inria.fr/isl-$portVersion.tar.bz2"

dev-libs/json_c/json_c-0.12.recipe

@@ -4,8 +4,7 @@ JSON-C implements a reference counting object model that allows you to easily \
 construct JSON objects in C, output them as JSON formatted strings and parse \
 JSON formatted strings back into the C representation of JSON objects."
 HOMEPAGE="https://github.com/json-c/json-c/wiki"
-COPYRIGHT="
+COPYRIGHT="2009-2012 Eric Haszlakiewicz
-	2009-2012 Eric Haszlakiewicz
 	2004, 2005 Metaparadigm Pte Ltd"
 LICENSE="MIT"
 REVISION="2"

dev-libs/libpcre/libpcre0-8.21.recipe

@@ -7,10 +7,8 @@ DESCRIPTION="
 	building proprietary software.
 	This package contains the native API."
 HOMEPAGE="http://www.pcre.org/"
-COPYRIGHT="
+COPYRIGHT="1997-2011 University of Cambridge
-	1997-2011 University of Cambridge
+	2007-2011 Google Inc. All rights reserved."
-	2007-2011, Google Inc. All rights reserved.
-	"
 LICENSE="PCRE"
 REVISION="6"
 SOURCE_URI="http://sourceforge.net/projects/pcre/files/pcre/8.21/pcre-8.21.tar.bz2"

dev-python/beautifulsoup/beautifulsoup-4.4.1.recipe

@@ -7,18 +7,12 @@ DESCRIPTION="
 	a few simple methods and Pythonic idioms for navigating and
 	searching a parse tree: a toolkit for dissecting a document and
 	extracting what you need"
-HOMEPAGE="
+HOMEPAGE="https://bugs.launchpad.net/beautifulsoup/
-	https://bugs.launchpad.net/beautifulsoup/
 	https://pypi.python.org/pypi/beautifulsoup4
-	http://www.crummy.com/software/BeautifulSoup/bs4/
+	http://www.crummy.com/software/BeautifulSoup/bs4/"
-	"
+COPYRIGHT="2004-2015 Leonard Richardson
-COPYRIGHT="
+	2006-2013 James Graham and other contributors"
-	2004-2015 Leonard Richardson
+LICENSE="MIT"
-	2006-2013 James Graham and other contributors
-	"
-LICENSE="
-	MIT
-	"
 REVISION="1"
 SOURCE_URI="https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.4.1.tar.gz"
 CHECKSUM_SHA256="87d4013d0625d4789a4f56b8d79a04d5ce6db1152bb65f1d39744f7709a366b4"

dev-python/feedparser/feedparser-5.2.1.recipe

@@ -1,18 +1,12 @@
 SUMMARY="Parse RSS and Atom feeds in Python"
 DESCRIPTION="
 	Parse RSS and Atom feeds in Python. 2000 unit tests. Open source."
-HOMEPAGE="
+HOMEPAGE="https://github.com/kurtmckee/feedparser
-	https://github.com/kurtmckee/feedparser
+	https://pypi.python.org/pypi/feedparser"
-	https://pypi.python.org/pypi/feedparser
+COPYRIGHT="2010-2015 Kurt McKee
-	"
+	2002-2008 Mark Pilgrim"
-COPYRIGHT="
+LICENSE="BSD (2-clause)
-	2010-2015 Kurt McKee
+	Python"
-	2002-2008 Mark Pilgrim
-	"
-LICENSE="
-	BSD (2-clause)
-	Python
-	"
 REVISION="1"
 SOURCE_URI="https://github.com/kurtmckee/feedparser/archive/5.2.1.tar.gz"
 CHECKSUM_SHA256="09367f95e58b9c5f70da70061d3e7f397ed8ec5d3c970e231ef011ff62de462f"

dev-python/feedparser/licenses/Python

@@ -0,0 +1,278 @@
+A. HISTORY OF THE SOFTWARE
+==========================
+
+Python was created in the early 1990s by Guido van Rossum at Stichting
+Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
+as a successor of a language called ABC.  Guido remains Python's
+principal author, although it includes many contributions from others.
+
+In 1995, Guido continued his work on Python at the Corporation for
+National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
+in Reston, Virginia where he released several versions of the
+software.
+
+In May 2000, Guido and the Python core development team moved to
+BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
+year, the PythonLabs team moved to Digital Creations (now Zope
+Corporation, see http://www.zope.com).  In 2001, the Python Software
+Foundation (PSF, see http://www.python.org/psf/) was formed, a
+non-profit organization created specifically to own Python-related
+Intellectual Property.  Zope Corporation is a sponsoring member of
+the PSF.
+
+All Python releases are Open Source (see http://www.opensource.org for
+the Open Source Definition).  Historically, most, but not all, Python
+releases have also been GPL-compatible; the table below summarizes
+the various releases.
+
+    Release         Derived     Year        Owner       GPL-
+                    from                                compatible? (1)
+
+    0.9.0 thru 1.2              1991-1995   CWI         yes
+    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
+    1.6             1.5.2       2000        CNRI        no
+    2.0             1.6         2000        BeOpen.com  no
+    1.6.1           1.6         2001        CNRI        yes (2)
+    2.1             2.0+1.6.1   2001        PSF         no
+    2.0.1           2.0+1.6.1   2001        PSF         yes
+    2.1.1           2.1+2.0.1   2001        PSF         yes
+    2.2             2.1.1       2001        PSF         yes
+    2.1.2           2.1.1       2002        PSF         yes
+    2.1.3           2.1.2       2002        PSF         yes
+    2.2.1           2.2         2002        PSF         yes
+    2.2.2           2.2.1       2002        PSF         yes
+    2.2.3           2.2.2       2003        PSF         yes
+    2.3             2.2.2       2002-2003   PSF         yes
+    2.3.1           2.3         2002-2003   PSF         yes
+    2.3.2           2.3.1       2002-2003   PSF         yes
+    2.3.3           2.3.2       2002-2003   PSF         yes
+    2.3.4           2.3.3       2004        PSF         yes
+    2.3.5           2.3.4       2005        PSF         yes
+    2.4             2.3         2004        PSF         yes
+    2.4.1           2.4         2005        PSF         yes
+    2.4.2           2.4.1       2005        PSF         yes
+    2.4.3           2.4.2       2006        PSF         yes
+    2.4.4           2.4.3       2006        PSF         yes
+    2.5             2.4         2006        PSF         yes
+    2.5.1           2.5         2007        PSF         yes
+    2.5.2           2.5.1       2008        PSF         yes
+    2.5.3           2.5.2       2008        PSF         yes
+    2.6             2.5         2008        PSF         yes
+    2.6.1           2.6         2008        PSF         yes
+    2.6.2           2.6.1       2009        PSF         yes
+    2.6.3           2.6.2       2009        PSF         yes
+    2.6.4           2.6.3       2009        PSF         yes
+    2.6.5           2.6.4       2010        PSF         yes
+
+Footnotes:
+
+(1) GPL-compatible doesn't mean that we're distributing Python under
+    the GPL.  All Python licenses, unlike the GPL, let you distribute
+    a modified version without making your changes open source.  The
+    GPL-compatible licenses make it possible to combine Python with
+    other software that is released under the GPL; the others don't.
+
+(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
+    because its license has a choice of law clause.  According to
+    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
+    is "not incompatible" with the GPL.
+
+Thanks to the many outside volunteers who have worked under Guido's
+direction to make these releases possible.
+
+
+B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
+===============================================================
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Python Software Foundation; All Rights Reserved" are retained in Python alone or
+in any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
+-------------------------------------------
+
+BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
+
+1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
+office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
+Individual or Organization ("Licensee") accessing and otherwise using
+this software in source or binary form and its associated
+documentation ("the Software").
+
+2. Subject to the terms and conditions of this BeOpen Python License
+Agreement, BeOpen hereby grants Licensee a non-exclusive,
+royalty-free, world-wide license to reproduce, analyze, test, perform
+and/or display publicly, prepare derivative works, distribute, and
+otherwise use the Software alone or in any derivative version,
+provided, however, that the BeOpen Python License is retained in the
+Software, alone or in any derivative version prepared by Licensee.
+
+3. BeOpen is making the Software available to Licensee on an "AS IS"
+basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
+SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
+DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+5. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+6. This License Agreement shall be governed by and interpreted in all
+respects by the law of the State of California, excluding conflict of
+law provisions.  Nothing in this License Agreement shall be deemed to
+create any relationship of agency, partnership, or joint venture
+between BeOpen and Licensee.  This License Agreement does not grant
+permission to use BeOpen trademarks or trade names in a trademark
+sense to endorse or promote products or services of Licensee, or any
+third party.  As an exception, the "BeOpen Python" logos available at
+http://www.pythonlabs.com/logos.html may be used according to the
+permissions granted on that web page.
+
+7. By copying, installing or otherwise using the software, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+
+
+CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
+---------------------------------------
+
+1. This LICENSE AGREEMENT is between the Corporation for National
+Research Initiatives, having an office at 1895 Preston White Drive,
+Reston, VA 20191 ("CNRI"), and the Individual or Organization
+("Licensee") accessing and otherwise using Python 1.6.1 software in
+source or binary form and its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, CNRI
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 1.6.1
+alone or in any derivative version, provided, however, that CNRI's
+License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
+1995-2001 Corporation for National Research Initiatives; All Rights
+Reserved" are retained in Python 1.6.1 alone or in any derivative
+version prepared by Licensee.  Alternately, in lieu of CNRI's License
+Agreement, Licensee may substitute the following text (omitting the
+quotes): "Python 1.6.1 is made available subject to the terms and
+conditions in CNRI's License Agreement.  This Agreement together with
+Python 1.6.1 may be located on the Internet using the following
+unique, persistent identifier (known as a handle): 1895.22/1013.  This
+Agreement may also be obtained from a proxy server on the Internet
+using the following URL: http://hdl.handle.net/1895.22/1013".
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 1.6.1 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 1.6.1.
+
+4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
+basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. This License Agreement shall be governed by the federal
+intellectual property law of the United States, including without
+limitation the federal copyright law, and, to the extent such
+U.S. federal law does not apply, by the law of the Commonwealth of
+Virginia, excluding Virginia's conflict of law provisions.
+Notwithstanding the foregoing, with regard to derivative works based
+on Python 1.6.1 that incorporate non-separable material that was
+previously distributed under the GNU General Public License (GPL), the
+law of the Commonwealth of Virginia shall govern this License
+Agreement only as to issues arising under or with respect to
+Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
+License Agreement shall be deemed to create any relationship of
+agency, partnership, or joint venture between CNRI and Licensee.  This
+License Agreement does not grant permission to use CNRI trademarks or
+trade name in a trademark sense to endorse or promote products or
+services of Licensee, or any third party.
+
+8. By clicking on the "ACCEPT" button where indicated, or by copying,
+installing or otherwise using Python 1.6.1, Licensee agrees to be
+bound by the terms and conditions of this License Agreement.
+
+        ACCEPT
+
+
+CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
+--------------------------------------------------
+
+Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
+The Netherlands.  All rights reserved.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior
+permission.
+
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

dev-python/imaging/python_imaging-1.1.7.recipe

@@ -3,10 +3,8 @@ DESCRIPTION="The Python Imaging Library (PIL) adds image processing \
 capabilities to your Python interpreter. This library supports many file \
 formats, and provides powerful image processing and graphics capabilities."
 HOMEPAGE="http://www.pythonware.com/products/pil/"
-COPYRIGHT="
+COPYRIGHT="1997-2011 by Secret Labs AB
-1997-2011 by Secret Labs AB
+	1995-2011 by Fredrik Lundh"
-1995-2011 by Fredrik Lundh
-"
 LICENSE="MIT"
 REVISION="2"
 SOURCE_URI="http://effbot.org/downloads/Imaging-1.1.7.tar.gz"

dev-python/iniparse/iniparse-0.4.recipe

@@ -16,8 +16,8 @@ making the order of entries in a config file significant, which is desirable \
 in applications like image galleries."
 HOMEPAGE="http://code.google.com/p/iniparse/"
 COPYRIGHT="2001-2008 Python Software Foundation
-2004-2009 Paramjit Oberoi
+	2004-2009 Paramjit Oberoi
-2007 Tim Lauridsen"
+	2007 Tim Lauridsen"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="http://iniparse.googlecode.com/files/iniparse-0.4.tar.gz"

dev-python/pathtools/pathtools-0.1.2.recipe

@@ -2,10 +2,8 @@ SUMMARY="HTTP library for human beings"
 DESCRIPTION="
 	Requests is an Apache2 Licensed HTTP library, written in Python, \
 	for human beings."
-HOMEPAGE="
+HOMEPAGE="http://python-requests.org/
-	http://python-requests.org/
+	http://pypi.python.org/pypi/requests"
-	http://pypi.python.org/pypi/requests
-	"
 COPYRIGHT="2010 Yesudeep Mangalapilly"
 LICENSE="MIT"
 REVISION="1"

dev-python/pillow/pillow-3.1.1.recipe

@@ -2,14 +2,10 @@ SUMMARY="Python Imaging Library (fork)"
 DESCRIPTION="
 	Pillow is the friendly PIL fork by Alex Clark and Contributors.
 	PIL is the Python Imaging Library by Fredrik Lundh and Contributors."
-HOMEPAGE="
+HOMEPAGE="https://github.com/python-imaging/Pillow
-	https://github.com/python-imaging/Pillow
+	https://pypi.python.org/pypi/Pillow"
-	https://pypi.python.org/pypi/Pillow
+COPYRIGHT="1997-2011 by Secret Labs AB
-	"
+	1995-2011 by Fredrik Lundh"
-COPYRIGHT="
-	1997-2011 by Secret Labs AB
-    1995-2011 by Fredrik Lundh
-    "
 LICENSE="HPND"
 REVISION="1"
 SOURCE_URI="https://pypi.python.org/packages/source/P/Pillow/Pillow-3.1.1.tar.gz"

dev-python/python_html2text/python_html2text-2016.1.8.recipe

@@ -3,11 +3,9 @@ DESCRIPTION="
 	html2text is a Python script that converts a page of HTML into clean,
 	easy-to-read plain ASCII text. Better yet, that ASCII also happens to be
 	valid Markdown (a text-to-HTML format)."
-HOMEPAGE="
+HOMEPAGE="https://github.com/html2text/html2text.py
-	https://github.com/html2text/html2text.py
 	https://github.com/Alir3z4/html2text
-	https://pypi.python.org/pypi/html2text
+	https://pypi.python.org/pypi/html2text"
-	"
 COPYRIGHT="2004-2008 Aaron Swartz"
 LICENSE="GNU GPL v3"
 REVISION="1"

dev-python/watchdog/watchdog-0.8.2.recipe

@@ -1,10 +1,8 @@
 SUMMARY="Filesystem events monitoring"
 DESCRIPTION="Python API and shell utilities to monitor file system events."
 HOMEPAGE="https://pypi.python.org/pypi/watchdog"
-COPYRIGHT="
+COPYRIGHT="2011 Yesudeep Mangalapilly
-	2011 Yesudeep Mangalapilly
+	2012 Google, Inc."
-	2012 Google, Inc.
-	"
 LICENSE="Apache v2"
 REVISION="1"
 SOURCE_URI="https://pypi.python.org/packages/source/w/watchdog/watchdog-0.8.2.tar.gz"

dev-util/cppunit/cppunit-1.12.1.recipe

@@ -8,7 +8,7 @@ COPYRIGHT="2000 Jerome Lacoste
 	2000-2002 E. Sommerlade
 	2001-2013 Baptiste Lepilleur
 	2001 Bastiaan Bakker
-	2001-2002, 2007-2008  Steve Robbins
+	2001-2002, 2007-2008 Steve Robbins
 	2012-2013 Harvey Brydon"
 LICENSE="GNU LGPL v2.1"
 REVISION="2"

dev-util/global/global-6.3.recipe

@@ -8,7 +8,7 @@ them at the point of independence of any editor. It runs on a UNIX(POSIX) \
 compatible operating system like GNU and BSD."
 HOMEPAGE="http://www.gnu.org/software/global/"
 COPYRIGHT="2000-2013 Tama Communications Corporation
-		2007-2013 Free Software Foundation, Inc."
+	2007-2013 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="http://ftp.gnu.org/pub/gnu/global/global-6.3.tar.gz"

games-action/btanks/btanks-0.9.8083.recipe

@@ -5,11 +5,9 @@ of weapons. It has original cartoon-like graphics and cool music, it's fun \
 and dynamic, it has several network modes for deathmatch and cooperative -- \
 what else is needed to have fun with your friends?"
 HOMEPAGE="http://btanks.sourceforge.net"
-COPYRIGHT="
+COPYRIGHT="2006-2009 Battle Tanks team
-	2006-2009 Battle Tanks team
 	2007-2008 Netive Media Group
-	2005-2007 Vladimir Menshakov
+	2005-2007 Vladimir Menshakov"
-	"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/project/btanks/btanks-source/btanks-$portVersion.tar.bz2"

games-board/dreamchess/dreamchess-0.2.0.recipe

@@ -14,10 +14,10 @@ The DreamChess team currently consists of only a handful of people. We could use
 areas, such as programming, graphics, sound and testing. If you’re interested in helping out, \
 please send an email to feedback at dreamchess.org."
 HOMEPAGE="http://www.dreamchess.org/"
-COPYRIGHT="2003-2007 Andrew Ball, Annie Kirkpatrick, Brandon May, Kris McAulay,
+COPYRIGHT="2003-2007 Andrew Ball, Annie Kirkpatrick, Brandon May, Kris McAulay, \
-		   Walter van Niftrik, Rogier van Schaijk, Lawrence Sebald, Matthew P. Smith
+Walter van Niftrik, Rogier van Schaijk, Lawrence Sebald, Matthew P. Smith
-		   1991-1993 The Regents of the University of California
+	1991-1993 The Regents of the University of California
-		   1998-2005 Gilles Vollant"
+	1998-2005 Gilles Vollant"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://github.com/dreamchess/dreamchess/releases/download/$portVersion/dreamchess-$portVersion.tar.gz"

haiku-apps/bescreencapture/bescreencapture-1.9.2.recipe

@@ -7,10 +7,8 @@ BeScreenCapture can record either the entire screen, or just a section you \
 select."
 HOMEPAGE="https://github.com/jackburton79/bescreencapture"
 COPYRIGHT="2013 Stefano Ceccherini"
-LICENSE="
+LICENSE="BSD (3-clause)
-	BSD (3-clause)
+	MIT"
-	MIT
-	"
 REVISION="2"
 SOURCE_URI="git://github.com/jackburton79/bescreencapture.git#fb7de7c5dec3768509072e3f3ee2a433bc9285bb"
 

haiku-apps/cdplayer/cdplayer-1.0.recipe

@@ -9,9 +9,8 @@ Modern computers only rarely fulfill these requirements.
 In that case you're better off mounting the CD in Tracker and use \
 MediaPlayer to play back the audio files in its wav folder."
 HOMEPAGE="https://github.com/HaikuArchives/CDPlayer"
-COPYRIGHT="1992-2000, Be Incorporated
+COPYRIGHT="1992-2000 Be Incorporated
-	2006-2009 by Haiku Inc.
+	2006-2009 by Haiku Inc."
-	"
 LICENSE="Be Sample Code License
 	MIT"
 REVISION="1"

haiku-apps/colors/colors-2.3.recipe

@@ -10,10 +10,8 @@ The Features:
  * You get a color preview for text (text and background color).
  * With an eye-dropper tool you can pick a color from anywhere on your desktop."
 HOMEPAGE="https://github.com/jscipione/Colors"
-COPYRIGHT="
+COPYRIGHT="2001-2008 Werner Freytag
-	2001-2008 Werner Freytag
+	2009-2013 John Scipione"
-	2009-2013 John Scipione
-	"
 LICENSE="MIT"
 REVISION="2"
 SOURCE_URI="git://github.com/jscipione/Colors#9d832d2c995f822e6386223cb36840743c7e886a"

haiku-apps/copynametoclipboard/copynametoclipboard-1.0.1.recipe

@@ -5,10 +5,8 @@ in different ways:
 Holding SHIFT copies just the file name, and holding CTRL \
 prints just one file name/path per line."
 HOMEPAGE="https://github.com/HaikuArchives/CopyNameToClipboard"
-COPYRIGHT="
+COPYRIGHT="2000 Werner Freytag
-	2000 Werner Freytag
+	2012 Humdinger"
-	2012 Humdinger
-	"
 LICENSE="MIT"
 REVISION="2"
 SOURCE_URI="git://github.com/HaikuArchives/CopyNameToClipboard#1da1d52429db53f15c3debf817e982d9ce6346b4"

haiku-apps/hare/hare-1.1.1.recipe

@@ -4,8 +4,7 @@ Hare - Haiku Audio Ripper Encoder, formerly known as Flip-Side A.E."
 HOMEPAGE="http://github.com/HaikuArchives/Hare"
 COPYRIGHT="2000 FlipSide Software
 	2001-2003 BeUnited.org
-	2009-2013 Hare Maintainers
+	2009-2013 Hare Maintainers"
-	"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="git://github.com/HaikuArchives/Hare.git#af69ba7b06"

haiku-apps/minimizeall/minimizeall-1.0.0.recipe

@@ -5,10 +5,8 @@ button on the Deskbar, or with a keypress. The app contains two parts: A \
 standalone app that minimizes the whole app, and a replicant for your Deskbar. \
 Both do the same: Minimize all your apps!"
 HOMEPAGE="https://github.com/HaikuArchives/MinimizeAll/"
-COPYRIGHT="
+COPYRIGHT="2001-2008 Werner Freytag
-	2001-2008 Werner Freytag
+	2009 Haiku"
-	2009 Haiku
-	"
 LICENSE="MIT"
 REVISION="3"
 SOURCE_URI="git://github.com/HaikuArchives/MinimizeAll.git#5afe6d4fab8f7e2a33727ef9152578b7d0c836ec"

haiku-apps/querywatcher/querywatcher-1.4.recipe

@@ -3,11 +3,9 @@ DESCRIPTION="
 This is a tiny little GUI application that monitors any regular Tracker \
 queries and displays miniature indicator lights for the presence of results."
 HOMEPAGE="https://github.com/HaikuArchives/QueryWatcher"
-COPYRIGHT="
+COPYRIGHT="2003-2004 Michael Armida
-	2003-2004 Michael Armida
 	2004 Mikael Eiman
-	2004 Michael Davidson
+	2004 Michael Davidson"
-	"
 LICENSE="Public Domain"
 REVISION="3"
 SOURCE_URI="git://github.com/HaikuArchives/QueryWatcher.git#006614d8faf8b2b650aab1e8919b87920496a8c7"

haiku-apps/sum_it/sum_it-0.2beta.recipe

@@ -5,10 +5,8 @@ Sum-It, the open source version of Maarten Hekkelman's Sum-It application. \
 Sum-It has many features, including a plug-in architecture for formulas and \
 graphs. This product includes software developed by Hekkelman Programmatuur B.V."
 HOMEPAGE="https://github.com/HaikuArchives/OpenSumIt"
-COPYRIGHT="
+COPYRIGHT="1996-1998, 2000	Hekkelman Programmatuur B.V.  All rights reserved.
-	1996-1998, 2000	Hekkelman Programmatuur B.V.  All rights reserved.
+	1999-2000 Tim Vernum. All rights reserved."
-	1999-2000 Tim Vernum. All rights reserved.
-	"
 LICENSE="BSD (4-clause)"
 REVISION="4"
 SOURCE_URI="https://github.com/HaikuArchives/OpenSumIt/archive/cdab184a27.tar.gz"

haiku-apps/systeminfo/systeminfo-2.recipe

@@ -9,8 +9,7 @@ It currently only shows:
 - Boot disk used space
 - Uptime"
 HOMEPAGE="https://github.com/disreali/SystemInfo"
-COPYRIGHT="
+COPYRIGHT="2002 Brent Miszalski
-	2002 Brent Miszalski
 	2012 Disreali"
 LICENSE="MIT"
 REVISION="3"

haiku-apps/trackergrep/trackergrep-5.2.recipe

@@ -5,7 +5,7 @@ through text files. Haiku already comes with a tool that lets you do that \
 of command-line trouble, because from now on TrackerGrep lets you run grep \
 directly from Tracker."
 HOMEPAGE="https://github.com/HaikuArchives/TrackerGrep"
-COPYRIGHT="	1998-2006 Matthijs Hollemans
+COPYRIGHT="1998-2006 Matthijs Hollemans
 	2007 Jonas Sundström."
 LICENSE="MIT"
 REVISION="1"

haiku-games/criticalmass/criticalmass-2.2.recipe

@@ -5,10 +5,8 @@ under control by carefully placing protons and creating chain reactions. \
 It can be played with a friend or against the computer, \
 with different AI levels."
 HOMEPAGE="https://github.com/pulkomandy/critical-mass"
-COPYRIGHT="
+COPYRIGHT="1998 Hamish Carr
-	1998 Hamish Carr
+	2011-2012 Adrien Destugues"
-	2011-2012 Adrien Destugues
-	"
 LICENSE="CriticalMass"
 REVISION="1"
 SOURCE_URI="git+https://github.com/pulkomandy/critical-mass#f597cad218830451f2ec7f5985bef23020bf28ec"

haiku-libs/haikuwebkit/haikuwebkit-1.2.0.recipe

@@ -6,8 +6,8 @@ JavaScript code began as a branch of the KHTML and KJS libraries from KDE."
 HOMEPAGE="http://www.webkit.org/"
 COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al"
 LICENSE="GNU LGPL v2
-	 GNU LGPL v2.1
+	GNU LGPL v2.1
-	 MIT"
+	MIT"
 REVISION="1"
 SOURCE_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.0-Source.tar.bz2"
 CHECKSUM_SHA256="b840d22eaf76f4b8fb14aa18e140a80abc0d58fa3c14694c978374c8fb4383d7"

haiku-libs/haikuwebkit/haikuwebkit-1.2.2.recipe

@@ -6,8 +6,8 @@ JavaScript code began as a branch of the KHTML and KJS libraries from KDE."
 HOMEPAGE="http://www.webkit.org/"
 COPYRIGHT="1998-2012 Apple Inc., Google Inc., et al"
 LICENSE="GNU LGPL v2
-	 GNU LGPL v2.1
+	GNU LGPL v2.1
-	 MIT"
+	MIT"
 REVISION="1"
 SOURCE_URI="http://pulkomandy.tk/drop/haikuwebkit_x86-1.2.2-Source.tar.bz2"
 CHECKSUM_SHA256="50688a5f78cbcc80dc2ec512effbcde36295560d2bbec0efaa9e0c679f303a42"

haiku-libs/libwalter/libwalter-97.recipe

@@ -2,7 +2,7 @@ SUMMARY="A collection of classes and controls"
 DESCRIPTION="LibWalter is a supplementary collection of class and controls not present in \
 the standard Haiku API."
 HOMEPAGE="https://github.com/HaikuArchives/LibWalter/"
-COPYRIGHT="1991-2000, Be Incorporated. All rights reserved.
+COPYRIGHT="1991-2000 Be Incorporated. All rights reserved.
 	1998 dirk116
 	2001 Atsushi Takamatsu
 	2003 Michael Pfeiffer

haiku-misc/substrate/substrate-1.0b.recipe

@@ -2,10 +2,8 @@ SUMMARY="Screensaver drawing interesting city-like structures"
 DESCRIPTION="Substrate is a screensaver which creates interesting images from \
 lines and circles. Inspired by xscreensaver's Substrate."
 HOMEPAGE="https://github.com/atalax/haiku-substrate"
-COPYRIGHT="
+COPYRIGHT="2003 Jared Tarbell
-	2003 Jared Tarbell
+	2014 Josef Gajdusek"
-	2014 Josef Gajdusek
-	"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://github.com/atalax/haiku-substrate/archive/v$portVersion.tar.gz"

media-fonts/libertine/libertine-5.3.0_2012_07_02.recipe

@@ -4,10 +4,8 @@ The Libertine(tm) Fonts is a serif and organic grotesque font family for practic
 The aim is to create a free alternative to the standard W*ndows Font (T*mes)."
 HOMEPAGE="https://linuxlibertine.org"
 COPYRIGHT="2012 Philipp H. Poll"
-LICENSE="
+LICENSE="GNU GPL font exception
-	GNU GPL font exception
+	SIL Open Font License v1.1"
-	SIL Open Font License v1.1
-"
 REVISION="1"
 SOURCE_URI="https://sourceforge.org/projects/linuxlibertine/files/linuxlibertine/5.3.0/LinLibertineOTF_$portVersion.tgz"
 CHECKSUM_SHA256="3eb84d13e59d390a3f0b15f93bbb590de693dd5f29c4e8083317dbbadf6fb985"

media-fonts/monoid/monoid-0.61.recipe

@@ -4,10 +4,8 @@ The Monoid Font is a customisable coding font with alternates, ligatures and \
 contextual positioning. Crazy crisp at 12px/9pt."
 HOMEPAGE="https://larsenwork.com/monoid"
 COPYRIGHT="2015 Andreas Larsen and contributors"
-LICENSE="
+LICENSE="MIT
-	MIT
+	SIL Open Font License v1.1"
-	SIL Open Font License v1.1
-"
 REVISION="1"
 SOURCE_URI="https://cdn.rawgit.com/larsenwork/monoid/f16ff9058bb97eafd78d61d415dedefe2d092562/Monoid.zip"
 CHECKSUM_SHA256="f03b41366bcbbf6ebd2cec0bb9f1d103c34fb67a00abb60b0d5a1385512c316d"

media-fonts/wqy_zenhei/wqy_zenhei-0.9.45.recipe

@@ -3,10 +3,8 @@ DESCRIPTION="\
 WenQuanYi Hei-Ti Style (sans-serif) Chinese outline font."
 HOMEPAGE="http://wenq.org/wqy2/index.cgi?Home"
 COPYRIGHT="2005-2010 Qianqian Fang and The WenQuanYi Project Board of Trustees"
-LICENSE="
+LICENSE="GNU GPL v2
-	GNU GPL v2
+	GNU GPL font exception"
-	GNU GPL font exception
-	"
 REVISION="3"
 SOURCE_URI="http://sourceforge.net/projects/wqy/files/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29/wqy-zenhei-0.9.45.tar.gz"
 CHECKSUM_SHA256="e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6"

media-gfx/grafx2/grafx2-2.5.recipe

@@ -6,7 +6,7 @@ pixel art, game graphics, and generally any detailed graphics painted with a \
 mouse."
 HOMEPAGE="http://pulkomandy.tk/projects/GrafX2"
 COPYRIGHT="1995-1999 Sunset Design
-2008-2015 GrafX2 project team"
+	2008-2015 GrafX2 project team"
 LICENSE="GNU GPL v2"
 REVISION="2"
 SOURCE_URI="svn://pulkomandy.tk/GrafX2/trunk#2127"

media-libs/bpg/bpg-0.9.4.recipe

@@ -4,10 +4,8 @@ provide a replacement for the JPEG format with better quality and smaller file\
  size."
 HOMEPAGE="http://bellard.org/bpg/"
 COPYRIGHT="2014 Fabrice Bellard"
-LICENSE="
+LICENSE="MIT
-	MIT
+	GNU LGPL v2.1"
-	GNU LGPL v2.1
-	"
 REVISION="1"
 SOURCE_URI="http://bellard.org/bpg/libbpg-0.9.4.tar.gz"
 CHECKSUM_SHA256="9986d66408f36fb678014bfcbb693c0f8358767719bc05797e4af54fa4237c2a"

media-libs/ftgl/ftgl-2.1.3~rc5.recipe

@@ -2,10 +2,8 @@ SUMMARY="Library to use arbitrary fonts in OpenGL applications"
 DESCRIPTION="FTGL is a free cross-platform Open Source C++ library that uses \
 Freetype2 to simplify rendering fonts in OpenGL applications."
 HOMEPAGE="http://sourceforge.net/projects/ftgl"
-COPYRIGHT="
+COPYRIGHT="2001-2004 Unicode, Inc.
-	2001-2004 Unicode, Inc.
+	2001-2009 Henry Maddocks"
-	2001-2009 Henry Maddocks
-	"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/project/ftgl/FTGL%20Source/2.1.3%7Erc5/ftgl-2.1.3-rc5.tar.gz"

media-libs/hamlib/hamlib-3.0.1.recipe

@@ -9,8 +9,8 @@ with radio equipment and other controllable devices such as rotators, \
 switches, etc."
 HOMEPAGE="http://www.hamlib.org/"
 COPYRIGHT="2000 Frank Singleton
-		2000-2011 Stephane Fillod
+	2000-2011 Stephane Fillod
-		2000-2012 The Hamlib Group"
+	2000-2012 The Hamlib Group"
 LICENSE="GNU LGPL v2
 	GNU GPL v2"
 REVISION="1"

media-libs/libdvdnav/libdvdnav-4.2.0.recipe

@@ -3,7 +3,7 @@ DESCRIPTION="libdvdnav allows easy use of sophisticated DVD navigation features
 DVD menus, multiangle playback and even interactive DVD games."
 HOMEPAGE="http://dvdnav.mplayerhq.hu/"
 COPYRIGHT="2000 Rich Wareham
-	   2001-2004 the dvdnav project"
+	2001-2004 the dvdnav project"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.0.tar.bz2"

media-libs/liblo/liblo-0.28.recipe

@@ -2,13 +2,11 @@ SUMMARY="Lightweight OSC (Open Sound Control) Implementation"
 DESCRIPTION="liblo is a lightweight library that provides an easy to use \
 implementation of the OSC protocol."
 HOMEPAGE="http://plugin.org.uk/liblo"
-COPYRIGHT="
+COPYRIGHT="2008-2012 Stephen Sinclair
-	2008-2012 Stephen Sinclair
 	2008 Kentaro Fukuchi
 	2005-2008 Nicholas Humfrey
 	2005 Martin Habets
-	2005-2006 Steve Harris
+	2005-2006 Steve Harris"
-	"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="http://prdownloads.sourceforge.net/liblo/liblo-$portVersion.tar.gz"

media-libs/libpng/libpng-1.5.26.recipe

@@ -4,8 +4,8 @@ all PNG features, is extensible, and has been extensively tested for over 17 \
 years"
 HOMEPAGE="http://www.libpng.org/"
 COPYRIGHT="1998-2015 Glenn Randers-Pehrson
-	   1996-1997 Andreas Dilger
+	1996-1997 Andreas Dilger
-	   1995-1996 Guy Eric Schalnat, Group 42, Inc."
+	1995-1996 Guy Eric Schalnat, Group 42 Inc."
 LICENSE="LibPNG"
 REVISION="2"
 SOURCE_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"

media-libs/libpng/libpng12-1.2.56.recipe

@@ -9,7 +9,7 @@ package."
 HOMEPAGE="http://www.libpng.org/"
 COPYRIGHT="1998-2015 Glenn Randers-Pehrson
 	1996-1997 Andreas Dilger
-	1995-1996 Guy Eric Schalnat, Group 42, Inc."
+	1995-1996 Guy Eric Schalnat, Group 42 Inc."
 LICENSE="LibPNG"
 REVISION="2"
 SOURCE_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz"

media-libs/libvisio/libvisio-0.0.31.recipe

@@ -4,15 +4,11 @@ DESCRIPTION="
 	diagrams into various applications. You can find it being used in \
 	libreoffice."
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/libvisio/"
-COPYRIGHT="
+COPYRIGHT="2011 Fridrich Strba
-	2011 Fridrich Strba
+	2011 Eilidh McAdam"
-	2011 Eilidh McAdam
+LICENSE="GNU GPL v2
-	"
-LICENSE="
-	GNU GPL v2
 	GNU LGPL v2.1
-	MPL v1.1
+	MPL v1.1"
-	"
 REVISION="2"
 SOURCE_URI="http://dev-www.libreoffice.org/src/libvisio-0.0.31.tar.gz"
 CHECKSUM_SHA256="4805b530eb79a9817d5daa3f069ef24959f439c0c0c80f12d30f9bc67b00cf90"

media-libs/netpbm/netpbm-10.68.recipe

@@ -11,224 +11,224 @@ Examples of the sort of image manipulation we're talking about are:
 - Creating a sequence of images that fade from one image to another"
 HOMEPAGE="http://netpbm.sourceforge.net"
 COPYRIGHT="2001 411toppm: Steve Allen
-1991 anytopnm: Jef Poskanzer
+	1991 anytopnm: Jef Poskanzer
-1989 asciitopgm: Wilson H. Bent, Jr
+	1989 asciitopgm: Wilson H. Bent, Jr
-1991 atktopbm: Bill Janssen
+	1991 atktopbm: Bill Janssen
-1993 bioradtopgm: Oliver Trepte
+	1993 bioradtopgm: Oliver Trepte
-1992 bmptoppm: David W. Sanderson
+	1992 bmptoppm: David W. Sanderson
-1988 brushtopbm: Jef Poskanzer
+	1988 brushtopbm: Jef Poskanzer
-1989 cmuwmtopbm: Jef Poskanzer
+	1989 cmuwmtopbm: Jef Poskanzer
-1995 eyuvtoppm: The Regents of the University of California
+	1995 eyuvtoppm: The Regents of the University of California
-1994-2000 fiascotopnm: Ullrich Hafner
+	1994-2000 fiascotopnm: Ullrich Hafner
-1989 fitstopnm: Jef Poskanzer
+	1989 fitstopnm: Jef Poskanzer
-1989 fstopgm: Jef Poskanzer
+	1989 fstopgm: Jef Poskanzer
-1989 g3topbm: Paul Haeberli
+	1989 g3topbm: Paul Haeberli
-1988 gemtopbm: Diomidis D. Spinellis
+	1988 gemtopbm: Diomidis D. Spinellis
-1988 gemtopnm: Diomidis D. Spinellis
+	1988 gemtopnm: Diomidis D. Spinellis
-1990-1993 giftopnm: David Koblas
+	1990-1993 giftopnm: David Koblas
-1990 gouldtoppm: Stephen P. Lesniewski
+	1990 gouldtoppm: Stephen P. Lesniewski
-1989 hipstopgm: Jef Poskanzer
+	1989 hipstopgm: Jef Poskanzer
-1988 icontopbm: Jef Poskanzer
+	1988 icontopbm: Jef Poskanzer
-1989 ilbmtoppm: Jef Poskanzer
+	1989 ilbmtoppm: Jef Poskanzer
-1989 imgtoppm: Jef Poskanzer
+	1989 imgtoppm: Jef Poskanzer
-2000 jbigtopnm: Markus Kuhn
+	2000 jbigtopnm: Markus Kuhn
-1991-2000 jpegtopnm: Thomas G. Lane, Bryan Henderson
+	1991-2000 jpegtopnm: Thomas G. Lane, Bryan Henderson
-1994 leaftoppm: Bill O'Donnell
+	1994 leaftoppm: Bill O'Donnell
-1988 lispmtopgm: Jef Poskanzer, Jamie Zawinski
+	1988 lispmtopgm: Jef Poskanzer, Jamie Zawinski
-1988 macptopbm: Jef Poskanzer
+	1988 macptopbm: Jef Poskanzer
-1999 mdatopbm: John Elliott
+	1999 mdatopbm: John Elliott
-1989 mgrtopbm: Jef Poskanzer
+	1989 mgrtopbm: Jef Poskanzer
-1989 mtvtoppm: Jef Poskanzer
+	1989 mtvtoppm: Jef Poskanzer
-2001 neotoppm: Teemu Hukkanen
+	2001 neotoppm: Teemu Hukkanen
-1995-2000 palmtopnm: Ian Goldberg, Bill Janssen
+	1995-2000 palmtopnm: Ian Goldberg, Bill Janssen
-1989 pamcut: Jef Poskanzer
+	1989 pamcut: Jef Poskanzer
-1991 pamfile: Jef Poskanzer
+	1991 pamfile: Jef Poskanzer
-1990 pamoil: Wilson Bent
+	1990 pamoil: Wilson Bent
-1989-1990 pbmclean: Jef Poskanzer, Angus Duggan
+	1989-1990 pbmclean: Jef Poskanzer, Angus Duggan
-1988-1991 pbmlife: Jef Poskanzer
+	1988-1991 pbmlife: Jef Poskanzer
-1988 pbmmake: Jef Poskanzer
+	1988 pbmmake: Jef Poskanzer
-1989-1991 pbmmask: Jef Poskanzer
+	1989-1991 pbmmask: Jef Poskanzer
-1998 pbmpage: Tim Norman
+	1998 pbmpage: Tim Norman
-1989-1990 pbmpscale: Jef Poskanzer, Angus Duggan
+	1989-1990 pbmpscale: Jef Poskanzer, Angus Duggan
-1989 pbmreduce: Jef Poskanzer
+	1989 pbmreduce: Jef Poskanzer
-1991 pbmtext: Jef Poskanzer
+	1991 pbmtext: Jef Poskanzer
-1990-1994 pbmto10x: Ken Yap
+	1990-1994 pbmto10x: Ken Yap
-1988-1992 pbmtoascii: Jef Poskanzer
+	1988-1992 pbmtoascii: Jef Poskanzer
-1991 pbmtoatk: Bill Janssen
+	1991 pbmtoatk: Bill Janssen
-1989 pbmtobbnbg: Mike Parker
+	1989 pbmtobbnbg: Mike Parker
-1989 pbmtocmuwm: Jef Poskanzer
+	1989 pbmtocmuwm: Jef Poskanzer
-1988 pbmtoepsi: Jef Poskanzer
+	1988 pbmtoepsi: Jef Poskanzer
-1990 pbmtoepson: Jef Poskanzer, John Tiller
+	1990 pbmtoepson: Jef Poskanzer, John Tiller
-1989 pbmtog3: Paul Haeberli
+	1989 pbmtog3: Paul Haeberli
-1988 pbmtogem: Jef Poskanzer, David Beckemeyer
+	1988 pbmtogem: Jef Poskanzer, David Beckemeyer
-1988-1989 pbmtogo: Jef Poskanzer, Michael Haberler, Bo Thide'
+	1988-1989 pbmtogo: Jef Poskanzer, Michael Haberler, Bo Thide'
-1988 pbmtoicon: Jef Poskanzer
+	1988 pbmtoicon: Jef Poskanzer
-1988 pbmtolj: Jef Poskanzer, Michael Haberler
+	1988 pbmtolj: Jef Poskanzer, Michael Haberler
-1988 pbmtomacp: Douwe vand der Schaaf
+	1988 pbmtomacp: Douwe vand der Schaaf
-1999 pbmtomda: John Elliott
+	1999 pbmtomda: John Elliott
-1989 pbmtomgr: Jef Poskanzer
+	1989 pbmtomgr: Jef Poskanzer
-2001 pbmtonokia: OMS Open Media System GmbH, Tim R<FC>hsen
+	2001 pbmtonokia: OMS Open Media System GmbH, Tim R<FC>hsen
-1989-1990 pbmtopgm: Jef Poskanzer, Angus Duggan
+	1989-1990 pbmtopgm: Jef Poskanzer, Angus Duggan
-1988 pbmtopi3: David Beckemeyer and Jef Poskanzer
+	1988 pbmtopi3: David Beckemeyer and Jef Poskanzer
-1990 pbmtoplot: Arthur David Olson
+	1990 pbmtoplot: Arthur David Olson
-1998 pbmtoppa: Tim Norman
+	1998 pbmtoppa: Tim Norman
-2001 pbmtopsg3: Kristof Koehler
+	2001 pbmtopsg3: Kristof Koehler
-1988 pbmtoptx: Jef Poskanzer
+	1988 pbmtoptx: Jef Poskanzer
-1999 pbmtowbmp: Terje Sannum
+	1999 pbmtowbmp: Terje Sannum
-1988 pbmtox10bm: Jef Poskanzer
+	1988 pbmtox10bm: Jef Poskanzer
-1988 pbmtoxbm: Jef Poskanzer
+	1988 pbmtoxbm: Jef Poskanzer
-1991 pbmtoybm: Jamie Zawinski and Jef Poskanzer
+	1991 pbmtoybm: Jamie Zawinski and Jef Poskanzer
-1988 pbmtozinc: James Darrell McCauley, Jef Poskanzer
+	1988 pbmtozinc: James Darrell McCauley, Jef Poskanzer
-1988 pbmupc: Jef Poskanzer
+	1988 pbmupc: Jef Poskanzer
-1990 pcxtoppm: Michael Davidson
+	1990 pcxtoppm: Michael Davidson
-1990 pgmbentley: Wilson Bent
+	1990 pgmbentley: Wilson Bent
-1989 pgmcrater: John Walker
+	1989 pgmcrater: John Walker
-1989 pgmedge: Jef Poskanzer
+	1989 pgmedge: Jef Poskanzer
-1989-1991 pgmenhance: Jef Poskanzer
+	1989-1991 pgmenhance: Jef Poskanzer
-1989 pgmhist: Jef Poskanzer
+	1989 pgmhist: Jef Poskanzer
-1992 pgmkernel: Alberto Accomazzi, Smithsonian Astrophysical Observatory
+	1992 pgmkernel: Alberto Accomazzi, Smithsonian Astrophysical Observatory
-1993 pgmnoise: Frank Neumann
+	1993 pgmnoise: Frank Neumann
-1989-1991 pgmnorm: Jef Poskanzer
+	1989-1991 pgmnorm: Jef Poskanzer
-1989 pgmramp: Jef Poskanzer
+	1989 pgmramp: Jef Poskanzer
-2000 pgmslice: Jos Dingjan
+	2000 pgmslice: Jos Dingjan
-1991 pgmtexture: Texas Agricultural Experiment Station, James Darrell McCauley
+	1991 pgmtexture: Texas Agricultural Experiment Station, James Darrell McCauley
-1991 pgmtofs: Jef Poskanzer
+	1991 pgmtofs: Jef Poskanzer
-1991 pgmtolispm: Jamie Zawinski and Jef Poskanzer
+	1991 pgmtolispm: Jamie Zawinski and Jef Poskanzer
-1989 pgmtopbm: Jef Poskanzer
+	1989 pgmtopbm: Jef Poskanzer
-1991 pgmtoppm: Jef Poskanzer
+	1991 pgmtoppm: Jef Poskanzer
-1991 pi1toppm: Steve Belczy and Jef Poskanzer
+	1991 pi1toppm: Steve Belczy and Jef Poskanzer
-1988 pi3topbm: David Beckemeyer and Diomidis D. Spinellis
+	1988 pi3topbm: David Beckemeyer and Diomidis D. Spinellis
-1989-1993 picttoppm: George Phillips
+	1989-1993 picttoppm: George Phillips
-1990 pjtoppm: Christos Zoulas
+	1990 pjtoppm: Christos Zoulas
-1995-1998 pngtopnm: Alexander Lehmann, Willem van Schaik
+	1995-1998 pngtopnm: Alexander Lehmann, Willem van Schaik
-1992 pnmalias: Alberto Accomazzi, Smithsonian Astrophysical Observatory
+	1992 pnmalias: Alberto Accomazzi, Smithsonian Astrophysical Observatory
-1989-1991 pnmarith: Jef Poskanzer
+	1989-1991 pnmarith: Jef Poskanzer
-1989-1991 pnmcat: Jef Poskanzer
+	1989-1991 pnmcat: Jef Poskanzer
-1992 pnmcomp: David Koblas
+	1992 pnmcomp: David Koblas
-1989-1995 pnmconvol: Jef Poskanzer, Mike Burns
+	1989-1995 pnmconvol: Jef Poskanzer, Mike Burns
-1988 pnmcrop: Jef Poskanzer
+	1988 pnmcrop: Jef Poskanzer
-1989 pnmcut: Jef Poskanzer
+	1989 pnmcut: Jef Poskanzer
-1989-1991 pnmdepth: Jef Poskanzer
+	1989-1991 pnmdepth: Jef Poskanzer
-1989 pnmenlarge: Jef Poskanzer
+	1989 pnmenlarge: Jef Poskanzer
-1991 pnmfile: Jef Poskanzer
+	1991 pnmfile: Jef Poskanzer
-1989 pnmflip: Jef Poskanzer
+	1989 pnmflip: Jef Poskanzer
-1991 pnmgamma: Jef Poskanzer and Bill Davidson
+	1991 pnmgamma: Jef Poskanzer and Bill Davidson
-1995 pnmhisteq: John Walker
+	1995 pnmhisteq: John Walker
-1993 pnmhistmap: Wilson H. Bent, Jr
+	1993 pnmhistmap: Wilson H. Bent, Jr
-1991 pnmindex: Jef Poskanzer
+	1991 pnmindex: Jef Poskanzer
-1998-2000 pnminterp: Russell Marks
+	1998-2000 pnminterp: Russell Marks
-1998-2000 pnminterp-gen: Russell Marks
+	1998-2000 pnminterp-gen: Russell Marks
-1989 pnminvert: Jef Poskanzer
+	1989 pnminvert: Jef Poskanzer
-1991 pnmmargin: Jef Poskanzer
+	1991 pnmmargin: Jef Poskanzer
-2000 pnmmontage: Ben Olmstead
+	2000 pnmmontage: Ben Olmstead
-1993 pnmnlfilt: Graeme W. Gill
+	1993 pnmnlfilt: Graeme W. Gill
-1991 pnmnoraw: Jef Poskanzer
+	1991 pnmnoraw: Jef Poskanzer
-1989-1990 pnmpad: Jef Poskanzer, Angus Duggan
+	1989-1990 pnmpad: Jef Poskanzer, Angus Duggan
-1989 pnmpaste: Jef Poskanzer
+	1989 pnmpaste: Jef Poskanzer
-1994-2000 pnmpsnr: Ullrich Hafner
+	1994-2000 pnmpsnr: Ullrich Hafner
-1989-1991 pnmrotate: Jef Poskanzer
+	1989-1991 pnmrotate: Jef Poskanzer
-1989-1991 pnmscale: Jef Poskanzer
+	1989-1991 pnmscale: Jef Poskanzer
-1989-1991 pnmscalefixed: Jef Poskanzer
+	1989-1991 pnmscalefixed: Jef Poskanzer
-1989-1991 pnmshear: Jef Poskanzer
+	1989-1991 pnmshear: Jef Poskanzer
-1984 pnmsmooth: Mike Burns
+	1984 pnmsmooth: Mike Burns
-2000 pnmsplit: Bryan Henderson
+	2000 pnmsplit: Bryan Henderson
-1989 pnmtile: Jef Poskanzer
+	1989 pnmtile: Jef Poskanzer
-1992 pnmtoddif: Digital Equipment Corporation, Burkhard Neidecker-Lutz
+	1992 pnmtoddif: Digital Equipment Corporation, Burkhard Neidecker-Lutz
-1994-2000 pnmtofiasco: Ullrich Hafner
+	1994-2000 pnmtofiasco: Ullrich Hafner
-1989 pnmtofits: Wilson H. Bent
+	1989 pnmtofits: Wilson H. Bent
-2000 pnmtojbig: Markus Kuhn
+	2000 pnmtojbig: Markus Kuhn
-1991-2001 pnmtojpeg: Thomas G. Lane, Bryan Henderson
+	1991-2001 pnmtojpeg: Thomas G. Lane, Bryan Henderson
-1995-2000 pnmtopalm: Ian Goldberg, Bill Janssen
+	1995-2000 pnmtopalm: Ian Goldberg, Bill Janssen
-1991 pnmtoplainpnm: Jef Poskanzer
+	1991 pnmtoplainpnm: Jef Poskanzer
-1995-1998 pnmtopng: Alexander Lehmann, Willem van Schaik
+	1995-1998 pnmtopng: Alexander Lehmann, Willem van Schaik
-1989 pnmtops: Jef Poskanzer
+	1989 pnmtops: Jef Poskanzer
-1989-1991 pnmtorast: Jef Poskanzer
+	1989-1991 pnmtorast: Jef Poskanzer
-1994 pnmtorle: Minnesota Supercomputer Center, Inc, Wes Barris
+	1994 pnmtorle: Minnesota Supercomputer Center, Inc, Wes Barris
-1994 pnmtosgi: Ingo Wilken
+	1994 pnmtosgi: Ingo Wilken
-1991 pnmtosir: Marvin Landis
+	1991 pnmtosir: Marvin Landis
-1990 pnmtotiff: Sun Microsystems, Inc, Jef Poskanzer
+	1990 pnmtotiff: Sun Microsystems, Inc, Jef Poskanzer
-1999 pnmtotiffcmyk: Andrew Cooke (Jara Software)
+	1999 pnmtotiffcmyk: Andrew Cooke (Jara Software)
-1989-1991 pnmtoxwd: Jef Poskanzer
+	1989-1991 pnmtoxwd: Jef Poskanzer
-1989 ppm3d: Jef Poskanzer
+	1989 ppm3d: Jef Poskanzer
-1989-1990 ppmbrighten: Jef Poskanzer, Brian Moffet
+	1989-1990 ppmbrighten: Jef Poskanzer, Brian Moffet
-1991 ppmchange: Wilson H. Bent, Jr
+	1991 ppmchange: Wilson H. Bent, Jr
-1995 ppmcie: John Walker
+	1995 ppmcie: John Walker
-2000 ppmcolormask: Bryan Henderson
+	2000 ppmcolormask: Bryan Henderson
-1993 ppmdim: Frank Neumann
+	1993 ppmdim: Frank Neumann
-1993 ppmdist: Dan Stromberg
+	1993 ppmdist: Dan Stromberg
-1991 ppmdither: Christos Zoulas
+	1991 ppmdither: Christos Zoulas
-1994 ppmfade: Minnesota Supercomputer Center, Inc, Wes Barris
+	1994 ppmfade: Minnesota Supercomputer Center, Inc, Wes Barris
-1993 ppmflash: Frank Neumann
+	1993 ppmflash: Frank Neumann
-1989 ppmforge: John Walker
+	1989 ppmforge: John Walker
-1989 ppmhist: Jef Poskanzer
+	1989 ppmhist: Jef Poskanzer
-1995 ppmlabel: John Walker
+	1995 ppmlabel: John Walker
-1989 ppmmake: Jef Poskanzer
+	1989 ppmmake: Jef Poskanzer
-1993 ppmmix: Frank Neumann
+	1993 ppmmix: Frank Neumann
-1989-1991 ppmnorm: Jef Poskanzer, Wilson H. Bent, Jr
+	1989-1991 ppmnorm: Jef Poskanzer, Wilson H. Bent, Jr
-1993 ppmntsc: Minnesota Supercomputer Center, Inc, Wes Barris
+	1993 ppmntsc: Minnesota Supercomputer Center, Inc, Wes Barris
-1989-1991 ppmpat: Jef Poskanzer
+	1989-1991 ppmpat: Jef Poskanzer
-1989-1991 ppmquant: Jef Poskanzer
+	1989-1991 ppmquant: Jef Poskanzer
-1991 ppmquantall: Jef Poskanzer
+	1991 ppmquantall: Jef Poskanzer
-1991-1992 ppmqvga: Bill Davidsen, Lyle Rains
+	1991-1992 ppmqvga: Bill Davidsen, Lyle Rains
-2001 ppmrainbow:	 Arjen Bax, Bryan Henderson
+	2001 ppmrainbow: Arjen Bax, Bryan Henderson
-1990 ppmrelief: Wilson H. Bent, Jr
+	1990 ppmrelief: Wilson H. Bent, Jr
-1997 ppmshadow: John Walker
+	1997 ppmshadow: John Walker
-1993 ppmshift: Frank Neumann
+	1993 ppmshift: Frank Neumann
-1993 ppmspread: Frank Neumann
+	1993 ppmspread: Frank Neumann
-1991 ppmtoacad: John Walker
+	1991 ppmtoacad: John Walker
-1992 ppmtobmp: David W. Sanderson
+	1992 ppmtobmp: David W. Sanderson
-1995 ppmtoeyuv: The Regents of the University of California
+	1995 ppmtoeyuv: The Regents of the University of California
-1990 ppmtoicr: Kanthan Pillay
+	1990 ppmtoicr: Kanthan Pillay
-1989 ppmtoilbm: Jef Poskanzer
+	1989 ppmtoilbm: Jef Poskanzer
-1994 ppmtoleaf: Bill O'Donnell
+	1994 ppmtoleaf: Bill O'Donnell
-2000 ppmtolj: Jonathan Melvin
+	2000 ppmtolj: Jonathan Melvin
-1989 ppmtomap: Jef Poskanzer
+	1989 ppmtomap: Jef Poskanzer
-1992-1993 ppmtomitsu: S.Petra Zeidler
+	1992-1993 ppmtomitsu: S.Petra Zeidler
-1995 ppmtompeg: The Regents of the University of California
+	1995 ppmtompeg: The Regents of the University of California
-2001 ppmtoneo: Teemu Hukkanen
+	2001 ppmtoneo: Teemu Hukkanen
-1994 ppmtopcx: Ingo Wilken
+	1994 ppmtopcx: Ingo Wilken
-1989 ppmtopgm: Jef Poskanzer
+	1989 ppmtopgm: Jef Poskanzer
-1991 ppmtopi1: Jef Poskanzer and Steve Belczyk
+	1991 ppmtopi1: Jef Poskanzer and Steve Belczyk
-1990 ppmtopict: Ken Yap
+	1990 ppmtopict: Ken Yap
-1990 ppmtopj: Christos Zoulas
+	1990 ppmtopj: Christos Zoulas
-1991 ppmtopuzz: Jef Poskanzer
+	1991 ppmtopuzz: Jef Poskanzer
-1991 ppmtorgb3: Jef Poskanzer
+	1991 ppmtorgb3: Jef Poskanzer
-1991 ppmtosixel: Rick Vinci
+	1991 ppmtosixel: Rick Vinci
-1989-1991 ppmtotga: Mark Shand and Jef Poskanzer
+	1989-1991 ppmtotga: Mark Shand and Jef Poskanzer
-1990 ppmtouil: Mark W. Snitily, Jef Poskanzer
+	1990 ppmtouil: Mark W. Snitily, Jef Poskanzer
-2000 ppmtowinicon: Lee Benfield
+	2000 ppmtowinicon: Lee Benfield
-1990 ppmtoxpm: Mark W. Snitily
+	1990 ppmtoxpm: Mark W. Snitily
-1987-1991 ppmtoyuv: Abekas Video Systems Inc, DHD PostImage Inc
+	1987-1991 ppmtoyuv: Abekas Video Systems Inc, DHD PostImage Inc
-1993 ppmtoyuvsplit: Andre Beck
+	1993 ppmtoyuvsplit: Andre Beck
-1993 ppmtv: Frank Neumann
+	1993 ppmtv: Frank Neumann
-1989 psidtopgm: Jef Poskanzer
+	1989 psidtopgm: Jef Poskanzer
-1992 pstopnm: Smithsonian Astrophysical Observatory, Alberto Accomazzi
+	1992 pstopnm: Smithsonian Astrophysical Observatory, Alberto Accomazzi
-1989 qrttoppm: Jef Poskanzer
+	1989 qrttoppm: Jef Poskanzer
-1989-1991 rasttopnm: Jef Poskanzer
+	1989-1991 rasttopnm: Jef Poskanzer
-1989 rawtopgm: Jef Poskanzer
+	1989 rawtopgm: Jef Poskanzer
-1991 rawtoppm: Jef Poskanzer
+	1991 rawtoppm: Jef Poskanzer
-1991 rgb3toppm: Jef Poskanzer
+	1991 rgb3toppm: Jef Poskanzer
-1994 rletopnm: Minnesota Supercomputer Center, Inc, Wes Barris
+	1994 rletopnm: Minnesota Supercomputer Center, Inc, Wes Barris
-1998 sbigtopgm: John Walker
+	1998 sbigtopgm: John Walker
-1994 sgitopnm: Ingo Wilken
+	1994 sgitopnm: Ingo Wilken
-1991 sirtopnm: Marvin Landis
+	1991 sirtopnm: Marvin Landis
-1991 sldtoppm: John Walker
+	1991 sldtoppm: John Walker
-1991 spctoppm: Jef Poskanzer and Steve Belczyk
+	1991 spctoppm: Jef Poskanzer and Steve Belczyk
-1991 sputoppm: Jef Poskanzer and Steve Belczyk
+	1991 sputoppm: Jef Poskanzer and Steve Belczyk
-1989 tgatoppm: Jef Poskanzer
+	1989 tgatoppm: Jef Poskanzer
-1990 tifftopnm: Sun Microsystems, Inc, Jef Poskanzer
+	1990 tifftopnm: Sun Microsystems, Inc, Jef Poskanzer
-2001 thinkjettopbm: W. Eric Norum
+	2001 thinkjettopbm: W. Eric Norum
-1999 wbmptopbm: Terje Sannum
+	1999 wbmptopbm: Terje Sannum
-2000 winicontoppm: Lee Benfield
+	2000 winicontoppm: Lee Benfield
-1988 xbmtopbm: Jef Poskanzer
+	1988 xbmtopbm: Jef Poskanzer
-1991 ximtoppm: Jef Poskanzer
+	1991 ximtoppm: Jef Poskanzer
-1991 xpmtoppm: Jef Poskanzer
+	1991 xpmtoppm: Jef Poskanzer
-1993 xvminitoppm: Ingo Wilken
+	1993 xvminitoppm: Ingo Wilken
-1989-1991 xwdtopnm: Jef Poskanzer
+	1989-1991 xwdtopnm: Jef Poskanzer
-1988 ybmtopbm: Jamie Zawinski and Jef Poskanzer
+	1988 ybmtopbm: Jamie Zawinski and Jef Poskanzer
-1993 yuvsplittoppm: Marcel Wijkstra
+	1993 yuvsplittoppm: Marcel Wijkstra
-1987-1991 yuvtoppm: Jef Poskanzer, Abekas Video Systems Inc., DHD PostImage Inc.
+	1987-1991 yuvtoppm: Jef Poskanzer, Abekas Video Systems Inc., DHD PostImage Inc.
-1993 zeisstopnm: Oliver Trepte"
+	1993 zeisstopnm: Oliver Trepte"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="svn+http://svn.code.sf.net/p/netpbm/code/advanced#2294"

media-libs/openjpeg/openjpeg-1.5.0.recipe

@@ -7,12 +7,12 @@ development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an \
 indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, \
 a Java-viewer for j2k-images."
 HOMEPAGE="http://www.openjpeg.org/"
-COPYRIGHT="2002-2012, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+COPYRIGHT="2002-2012 Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
 	2002-2012 Professor Benoit Macq
- 	2003-2012 Antonin Descampe
+	2003-2012 Antonin Descampe
- 	2003-2009 Francois-Olivier Devaux
+	2003-2009 Francois-Olivier Devaux
- 	2005 Herve Drolon, FreeImage Team
+	2005 Herve Drolon, FreeImage Team
- 	2002-2003 Yannick Verschueren
+	2002-2003 Yannick Verschueren
 	2001-2003 David Janssens"
 LICENSE="BSD (2-clause)"
 REVISION="1"

media-libs/taglib/taglib-1.7.2.recipe

@@ -7,8 +7,7 @@ TrueAudio, WAV, AIFF, MP4 and ASF files."
 HOMEPAGE="http://github.com/taglib"
 COPYRIGHT="2002-2012 Scott Wheeler"
 LICENSE="GNU LGPL v2
-	MPL v1.1
+	MPL v1.1"
-	"
 REVISION="2"
 SOURCE_URI="http://taglib.github.io/releases/taglib-1.7.2.tar.gz"
 CHECKSUM_SHA256="38f7e5283b594021b28426a61339cffbf2d503b450338b02f651fab1b0b42899"

media-sound/protrekkr/protrekkr-2.5.4.recipe

@@ -7,8 +7,7 @@ psytrance, trance goa, hard acid, IDM, chip, techno, etc.) for small sized \
 intros, demos or games."
 HOMEPAGE="http://code.google.com/p/protrekkr/"
 COPYRIGHT="2008-2010 Franck Charlet.
-Based on Juan Antonio Arguelles Rius's NoiseTrekker.
+	Based on Juan Antonio Arguelles Rius's NoiseTrekker."
-	"
 LICENSE="BSD (3-clause)"
 REVISION="2"
 SOURCE_URI="svn+http://protrekkr.googlecode.com/svn/trunk/#670"

net-dialup/minicom/minicom-2.6.2.recipe

@@ -2,8 +2,7 @@ SUMMARY="A menu driven communications program"
 DESCRIPTION="Minicom is a menu driven communications program. It emulates \
 ANSI and VT102 terminals. It has a dialing directory and auto zmodem download."
 HOMEPAGE="https://alioth.debian.org/projects/minicom/"
-COPYRIGHT="
+COPYRIGHT="1991-1996 Miquel van Smoorenburg"
-	1991-1996 Miquel van Smoorenburg"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://alioth.debian.org/frs/download.php/file/3869/minicom-2.6.2.tar.gz"

net-irc/quassel/quassel-0.10.0.recipe

@@ -10,10 +10,8 @@ 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"
 COPYRIGHT="2005-2014 The Quassel IRC Team"
-LICENSE="
+LICENSE="GNU GPL v2
-	GNU GPL v2
+	GNU GPL v3"
-	GNU GPL v3
-	"
 REVISION="3"
 SOURCE_URI="http://quassel-irc.org/pub/quassel-0.10.0.tar.bz2"
 CHECKSUM_SHA256="68228ce23aa3a992add3d00cb1e8b4863d8ca64bea99c881edf6d16ff9ec7c23"

net-irc/quassel/quassel-0.9.2.recipe

@@ -10,10 +10,8 @@ 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"
 COPYRIGHT="2005-2009 The Quassel IRC Team"
-LICENSE="
+LICENSE="GNU GPL v2
-	GNU GPL v2
+	GNU GPL v3"
-	GNU GPL v3
-	"
 REVISION="3"
 SOURCE_URI="http://quassel-irc.org/pub/quassel-0.9.2.tar.bz2"
 CHECKSUM_SHA256="f04d01602509c1d950602502e5f51aba47d99c73a9c70e77c563bb7749fc53c0"

net-libs/gnutls/gnutls-2.8.6.recipe

@@ -6,11 +6,9 @@ communications protocols as well as APIs to parse and write X.509, PKCS #12, \
 OpenPGP and other required structures. It is aimed to be portable and \
 efficient with focus on security and interoperability."
 HOMEPAGE="http://www.gnutls.org/"
-COPYRIGHT="
+COPYRIGHT="2009-2010 Free Software Fundation Inc.
-	2009-2010 Free Software Fundation Inc.
 	2004-2008 Simon Josefsson
-	2000-2004 Nikos Mavrogiannopoulos
+	2000-2004 Nikos Mavrogiannopoulos"
-	"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="ftp://ftp.gnu.org/pub/gnu/gnutls/gnutls-2.8.6.tar.bz2"

net-libs/libhttp/libhttp-0.9.mod.recipe

@@ -4,7 +4,7 @@ HTTP and other protocols. It is a legacy library and shouldn't be used in new \
 code anymore."
 HOMEPAGE="https://github.com/HaikuArchives/libHTTP"
 COPYRIGHT="1999 Joe Kloss
-2015 Puck Meerburg"
+	2015 Puck Meerburg"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/HaikuArchives/libHTTP/archive/4a94696b445d88bc48c070ca3e9276e2e942059a.tar.gz"

net-libs/liboauth/liboauth-1.0.3.recipe

@@ -5,13 +5,9 @@ OAuth specifications and offers high-level functionality built on top to sign \
 requests or verify signatures using either NSS or OpenSSL for calculating \
 the hash/signatures."
 HOMEPAGE="http://liboauth.sourceforge.net"
-COPYRIGHT="
+COPYRIGHT="2007-2014 Robin Gareus"
-	2007-2014 Robin Gareus
+LICENSE="GNU GPL v2
-	"
+	MIT"
-LICENSE="
-	GNU GPL v2
-	MIT
-	"
 REVISION="1"
 SOURCE_URI="http://downloads.sourceforge.net/project/liboauth/liboauth-$portVersion.tar.gz"
 CHECKSUM_SHA256="0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f"

net-p2p/retroshare/retroshare-0.6.0.recipe

@@ -5,10 +5,8 @@ no central servers. It is entirely Open-Source and free. There are no costs, \
 no ads and no Terms of Service."
 HOMEPAGE="http://retroshare.sourceforge.net/"
 COPYRIGHT="2006-2015, drbob"
-LICENSE="
+LICENSE="GNU GPL v2
-	GNU GPL v2
+	GNU LGPL v2.1"
-	GNU LGPL v2.1
-	"
 REVISION="1"
 SOURCE_URI="https://github.com/RetroShare/RetroShare/archive/v0.6.0-RC2-SVN.zip"
 CHECKSUM_SHA256="a5c75a274cd2f2028a2f96d3b0188fd9297505d4b47fb5e338bd6bada618baab"

net-wireless/wpa_supplicant/wpa_supplicant-0.7.3.recipe

@@ -8,10 +8,8 @@ negotiation with a WPA Authenticator and it controls the roaming and IEEE \
 802.11 authentication/association of the wlan driver."
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
 COPYRIGHT="2003-2010 Jouni Malinen"
-LICENSE="
+LICENSE="BSD (2-clause)
-	BSD (2-clause)
+	GNU GPL v2"
-	GNU GPL v2
-	"
 REVISION="2"
 SOURCE_URI="http://hostap.epitest.fi/releases/wpa_supplicant-0.7.3.tar.gz"
 CHECKSUM_SHA256="d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"

net-wireless/wpa_supplicant/wpa_supplicant-2.0.recipe

@@ -8,10 +8,8 @@ negotiation with a WPA Authenticator and it controls the roaming and IEEE \
 802.11 authentication/association of the wlan driver."
 HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/"
 COPYRIGHT="2003-2012 Jouni Malinen"
-LICENSE="
+LICENSE="BSD (2-clause)
-	BSD (2-clause)
+	GNU GPL v2"
-	GNU GPL v2
-	"
 REVISION="4"
 SOURCE_URI="http://hostap.epitest.fi/releases/wpa_supplicant-2.0.tar.gz"
 CHECKSUM_SHA256="2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09"

sci-libs/cln/cln-1.3.4.recipe

@@ -6,11 +6,9 @@ supports a wide range of types and functions that operate on them. It is \
 highly optimized in terms of both efficiency and speed and provides great \
 interoperability."
 HOMEPAGE="http://www.ginac.de/CLN/"
-COPYRIGHT="
+COPYRIGHT="1988-2008 Bruno Haible
-	1988-2008 Bruno Haible
 	2000-2014 Richard Kreckel
-	2008-2010 Alexei Sheplyakov
+	2008-2010 Alexei Sheplyakov"
-	"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://www.ginac.de/CLN/cln-$portVersion.tar.bz2"

sci-libs/fftw/fftw-3.3.4.recipe

@@ -13,10 +13,8 @@ will perform well on most architectures without modification. Hence the name, \
 FFTW, which stands for the somewhat whimsical title of Fastest Fourier \
 Transform in the West."
 HOMEPAGE="http://www.fftw.org/"
-COPYRIGHT="
+COPYRIGHT="2003, 2007-2011 Matteo Frigo
-	2003, 2007-2011 Matteo Frigo
+	2003, 2007-2011 Massachusetts Institute of Technology"
-	2003, 2007-2011 Massachusetts Institute of Technology
-	"
 LICENSE="GNU GPL v2"
 REVISION="6"
 SOURCE_URI="http://www.fftw.org/fftw-$portVersion.tar.gz"

sci-libs/gsl/gsl-1.16.recipe

@@ -48,7 +48,7 @@ COPYRIGHT="1996-2007, 2009, 2010 Gerard Jungman
 	2001 Rodney Sparapani
 	2002 Achim Gaedke
 	1996, 1997, 1998, 1999, 2000, 2007 Jorma Olavi Ttinen
-	2002-2004 Jason H. Stover	"
+	2002-2004 Jason H. Stover"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="http://ftp.gnu.org/gnu/gsl/gsl-$portVersion.tar.gz"

sys-apps/file/file-5.25.recipe

@@ -6,7 +6,7 @@ number' of several thousands of file types. This version is the standard \
 exact release number)."
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 COPYRIGHT="1986-1999 Ian F. Darwin
-1994-2013 Christos Zoulas"
+	1994-2013 Christos Zoulas"
 LICENSE="BSD (2-clause)"
 REVISION="1"
 SOURCE_URI="ftp://ftp.astron.com/pub/file/file-$portVersion.tar.gz"

sys-devel/bc/bc-1.06.recipe

@@ -5,10 +5,8 @@ interactive execution of statements. bc is a utility included in the POSIX \
 P1003.2/D11 draft standard."
 HOMEPAGE="http://www.gnu.org/software/bc/bc.html"
 COPYRIGHT="1991-2000 Free Software Foundation, Inc."
-LICENSE="
+LICENSE="GNU GPL v2
-	GNU GPL v2
+	GNU LGPL v2.1"
-	GNU LGPL v2.1
-	"
 REVISION="2"
 SOURCE_URI="http://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz"
 CHECKSUM_SHA256="4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"

sys-devel/flex/flex-2.5.35.recipe

@@ -2,10 +2,8 @@ SUMMARY="A tool for generating scanners"
 DESCRIPTION="Flex is a fast lexical analyser generator. It is a tool for \
 generating programs that perform pattern-matching on text."
 HOMEPAGE="http://flex.sourceforge.net/"
-COPYRIGHT="
+COPYRIGHT="2001-2007 The Flex Project
-	2001-2007 The Flex Project
+	1990, 1997 The Regents of the University of California"
-	1990, 1997 The Regents of the University of California
-	"
 LICENSE="Flex"
 REVISION="6"
 SOURCE_URI="http://sourceforge.net/projects/flex/files/flex/flex-2.5.35/flex-2.5.35.tar.bz2/download"

sys-devel/flex/flex-2.5.39.recipe

@@ -2,10 +2,8 @@ SUMMARY="A tool for generating scanners"
 DESCRIPTION="Flex is a fast lexical analyser generator. It is a tool for \
 generating programs that perform pattern-matching on text."
 HOMEPAGE="http://flex.sourceforge.net/"
-COPYRIGHT="
+COPYRIGHT="2001-2007 The Flex Project
-	2001-2007 The Flex Project
+	1990, 1997 The Regents of the University of California"
-	1990, 1997 The Regents of the University of California
-	"
 LICENSE="Flex"
 REVISION="2"
 SOURCE_URI="http://sourceforge.net/projects/flex/files/flex-$portVersion.tar.bz2"

sys-devel/flex/flex-2.6.0.recipe

@@ -2,10 +2,8 @@ SUMMARY="A tool for generating scanners"
 DESCRIPTION="Flex is a fast lexical analyser generator. It is a tool for \
 generating programs that perform pattern-matching on text."
 HOMEPAGE="http://flex.sourceforge.net/"
-COPYRIGHT="
+COPYRIGHT="2001-2007 The Flex Project
-	2001-2007 The Flex Project
+	1990, 1997 The Regents of the University of California"
-	1990, 1997 The Regents of the University of California
-	"
 LICENSE="Flex"
 REVISION="1"
 SOURCE_URI="http://sourceforge.net/projects/flex/files/flex-$portVersion.tar.bz2"

sys-libs/mtdev/mtdev-1.1.5.recipe

@@ -4,10 +4,8 @@ kernel MT events to the slotted type B protocol. The events put into \
 mtdev may be from any MT device, specifically type A without contact \
 tracking, type A with contact tracking, or type B with contact tracking."
 HOMEPAGE="http://bitmath.org/code/mtdev/"
-COPYRIGHT="
+COPYRIGHT="2010 Kenrik Rydberg
-	2010 Kenrik Rydberg
+	2010 Canonical Ltd."
-	2010 Canonical Ltd.
-	"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="http://bitmath.org/code/mtdev/mtdev-1.1.5.tar.bz2"

www-servers/robinhood/robinhood-1.2.recipe

@@ -4,7 +4,7 @@ authentication, virtual hosts, virtual folders, CGI, SSI, Ranges, and much more\
 !"
 HOMEPAGE="https://haikuarchives.github.io/RobinHood/"
 COPYRIGHT="1999-2001 The Robin Hood Development Team
-2015 Puck Meerburg"
+	2015 Puck Meerburg"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/HaikuArchives/RobinHood/archive/a1a81cddf007bd81d53c3b9d5fc23197c0da554d.tar.gz"

x11-misc/util_macros/util_macros-1.17.0_git.recipe

@@ -4,7 +4,7 @@ scripts in other Xorg modular packages, and is needed to generate new \
 versions of their configure scripts with autoconf."
 HOMEPAGE="http://cgit.freedesktop.org/xorg/util/macros/"
 COPYRIGHT="2005 Red Hat, Inc.
-	2005, 2006, Oracle and/or its affiliates"
+	2005, 2006 Oracle and/or its affiliates"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="git://anongit.freedesktop.org/xorg/util/macros"