diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2011-12-15 07:42:44 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2011-12-15 07:42:44 +0000 |
| commit | 2e4d33c2ff459f04632661900d7558ff0afa39f0 (patch) | |
| tree | 5630fe6d633fa2db92467a237500ddf0c4e9eea3 /dev-lang/yasm | |
| parent | Version bump. Drop hppa,ppc64 due to new dmidecode dependency, bug 394785. (diff) | |
| download | gentoo-2-2e4d33c2ff459f04632661900d7558ff0afa39f0.tar.gz gentoo-2-2e4d33c2ff459f04632661900d7558ff0afa39f0.tar.bz2 gentoo-2-2e4d33c2ff459f04632661900d7558ff0afa39f0.zip | |
Fix LICENSE, bug 360501 comment #12.
(Portage version: 2.1.10.40/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/yasm')
| -rw-r--r-- | dev-lang/yasm/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/yasm/yasm-1.1.0-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-lang/yasm/yasm-1.2.0.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-lang/yasm/ChangeLog b/dev-lang/yasm/ChangeLog index 273c08193dce..bf3abb452246 100644 --- a/dev-lang/yasm/ChangeLog +++ b/dev-lang/yasm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/yasm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.48 2011/11/20 00:04:16 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.49 2011/12/15 07:42:44 ulm Exp $ + + 15 Dec 2011; Ulrich Mueller <ulm@gentoo.org> yasm-1.1.0-r1.ebuild, + yasm-1.2.0.ebuild: + Fix LICENSE, bug 360501 comment #12. 20 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> yasm-1.1.0-r1.ebuild, yasm-1.2.0.ebuild: diff --git a/dev-lang/yasm/yasm-1.1.0-r1.ebuild b/dev-lang/yasm/yasm-1.1.0-r1.ebuild index 31bcb5ccfa25..102aabcd9a51 100644 --- a/dev-lang/yasm/yasm-1.1.0-r1.ebuild +++ b/dev-lang/yasm/yasm-1.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.1.0-r1.ebuild,v 1.4 2011/11/20 00:04:16 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.1.0-r1.ebuild,v 1.5 2011/12/15 07:42:44 ulm Exp $ EAPI=2 PYTHON_DEPEND="python? 2:2.6" @@ -11,7 +11,7 @@ DESCRIPTION="An assembler for x86 and x86_64 instruction sets" HOMEPAGE="http://www.tortall.net/projects/yasm/" SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz" -LICENSE="Artistic BSD BSD-2 GPL-2 LGPL-2" +LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )" SLOT="0" KEYWORDS="-* amd64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" IUSE="nls python" diff --git a/dev-lang/yasm/yasm-1.2.0.ebuild b/dev-lang/yasm/yasm-1.2.0.ebuild index 88992b505fd7..db702d0842eb 100644 --- a/dev-lang/yasm/yasm-1.2.0.ebuild +++ b/dev-lang/yasm/yasm-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.2.0.ebuild,v 1.2 2011/11/20 00:04:16 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.2.0.ebuild,v 1.3 2011/12/15 07:42:44 ulm Exp $ EAPI=4 PYTHON_DEPEND="python? 2:2.7" @@ -10,7 +10,7 @@ DESCRIPTION="An assembler for x86 and x86_64 instruction sets" HOMEPAGE="http://www.tortall.net/projects/yasm/" SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz" -LICENSE="Artistic BSD BSD-2 GPL-2 LGPL-2" +LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )" SLOT="0" KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" IUSE="nls python" |