diff options
17 files changed, 22 insertions, 16 deletions
diff --git a/g_octave/description.py b/g_octave/description.py index a19fb67..df0c23e 100644 --- a/g_octave/description.py +++ b/g_octave/description.py @@ -147,7 +147,10 @@ class Description(object): # license if key == 'license': - new_license = self._config.licenses.get(self._desc['license']) + try: + new_license = self._config.licenses.get(self._desc['license']) + except: + new_license = '' if new_license not in [None, '']: self._desc['license_gentoo'] = new_license else: diff --git a/tests/files/ebuilds/extra1-0.0.1.ebuild b/tests/files/ebuilds/extra1-0.0.1.ebuild index 639699b..9e67791 100644 --- a/tests/files/ebuilds/extra1-0.0.1.ebuild +++ b/tests/files/ebuilds/extra1-0.0.1.ebuild @@ -11,7 +11,7 @@ inherit g-octave eutils DESCRIPTION="This is the Extra 1 description" HOMEPAGE="http://extra1.org" -LICENSE="|| ( GPL-2 GPL-3 LGPL BSD GFDL )" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/tests/files/ebuilds/extra2-0.0.1.ebuild b/tests/files/ebuilds/extra2-0.0.1.ebuild index e26c18f..168e9ed 100644 --- a/tests/files/ebuilds/extra2-0.0.1.ebuild +++ b/tests/files/ebuilds/extra2-0.0.1.ebuild @@ -11,7 +11,7 @@ inherit g-octave DESCRIPTION="This is the Extra 2 description" HOMEPAGE="http://extra2.org" -LICENSE="|| ( GPL-2 GPL-3 LGPL BSD GFDL )" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/tests/files/ebuilds/language1-0.0.1.ebuild b/tests/files/ebuilds/language1-0.0.1.ebuild index 4181a52..8964935 100644 --- a/tests/files/ebuilds/language1-0.0.1.ebuild +++ b/tests/files/ebuilds/language1-0.0.1.ebuild @@ -11,7 +11,7 @@ inherit g-octave eutils DESCRIPTION="This is the Language 1 description" HOMEPAGE="http://language1.org" -LICENSE="|| ( GPL-2 GPL-3 LGPL BSD GFDL )" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/tests/files/ebuilds/language2-0.0.1.ebuild b/tests/files/ebuilds/language2-0.0.1.ebuild index 72700a9..d10e597 100644 --- a/tests/files/ebuilds/language2-0.0.1.ebuild +++ b/tests/files/ebuilds/language2-0.0.1.ebuild @@ -11,7 +11,7 @@ inherit g-octave DESCRIPTION="This is the Language 2 description" HOMEPAGE="http://language2.org" -LICENSE="|| ( GPL-2 GPL-3 LGPL BSD GFDL )" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/tests/files/ebuilds/main1-0.0.1.ebuild b/tests/files/ebuilds/main1-0.0.1.ebuild index ef047a9..b9e2257 100644 --- a/tests/files/ebuilds/main1-0.0.1.ebuild +++ b/tests/files/ebuilds/main1-0.0.1.ebuild @@ -11,7 +11,7 @@ inherit g-octave eutils DESCRIPTION="This is the Main 1 description" HOMEPAGE="http://main1.org" -LICENSE="|| ( GPL-2 GPL-3 LGPL BSD GFDL )" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/tests/files/ebuilds/main2-0.0.1.ebuild b/tests/files/ebuilds/main2-0.0.1.ebuild index 27c3681..3b4178a 100644 --- a/tests/files/ebuilds/main2-0.0.1.ebuild +++ b/tests/files/ebuilds/main2-0.0.1.ebuild @@ -11,7 +11,7 @@ inherit g-octave DESCRIPTION="This is the Main 2 description" HOMEPAGE="http://main2.org" -LICENSE="|| ( GPL-2 GPL-3 LGPL BSD GFDL )" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" diff --git a/tests/files/info.json b/tests/files/info.json index 8e66397..d45a33a 100644 --- a/tests/files/info.json +++ b/tests/files/info.json @@ -8,5 +8,8 @@ "pkg6": "sci-mathematics/pkg6", "pkg7": "sci-mathematics/pkg7", "pkg8": "sci-mathematics/pkg8" + }, + "licenses": { + "GPL-3": "" } } diff --git a/tests/files/octave-forge/extra/extra1/extra1-0.0.1.DESCRIPTION b/tests/files/octave-forge/extra/extra1/extra1-0.0.1.DESCRIPTION index ee6ca22..bf69dca 100644 --- a/tests/files/octave-forge/extra/extra1/extra1-0.0.1.DESCRIPTION +++ b/tests/files/octave-forge/extra/extra1/extra1-0.0.1.DESCRIPTION @@ -13,4 +13,4 @@ SystemRequirements: pkg1 ( >= 4.3.2 ), pkg2 ( <1.2.3 ), pkg3 BuildRequires: pkg4 ( >1.0.0 ) Depends: Octave ( >= 3.2.0 ) Autoload: NO -License: GPL version 3 or later +License: GPL-3 diff --git a/tests/files/octave-forge/extra/extra2/extra2-0.0.1.DESCRIPTION b/tests/files/octave-forge/extra/extra2/extra2-0.0.1.DESCRIPTION index 6f56665..c3ebc77 100644 --- a/tests/files/octave-forge/extra/extra2/extra2-0.0.1.DESCRIPTION +++ b/tests/files/octave-forge/extra/extra2/extra2-0.0.1.DESCRIPTION @@ -13,4 +13,4 @@ SystemRequirements: pkg5 ( >= 4.3.2 ), pkg6 ( <1.2.3 ), pkg7 BuildRequires: pkg8 ( >1.0.0 ) Depends: Octave ( >= 3.2.0 ) Autoload: NO -License: GPL version 3 or later +License: GPL-3 diff --git a/tests/files/octave-forge/extra/extra2/extra2-0.0.2.DESCRIPTION b/tests/files/octave-forge/extra/extra2/extra2-0.0.2.DESCRIPTION index eed9a66..9d97b77 100644 --- a/tests/files/octave-forge/extra/extra2/extra2-0.0.2.DESCRIPTION +++ b/tests/files/octave-forge/extra/extra2/extra2-0.0.2.DESCRIPTION @@ -13,4 +13,4 @@ SystemRequirements: pkg5 ( >= 4.3.2 ), pkg6 ( <1.2.3 ), pkg7 BuildRequires: pkg8 ( >1.0.0 ) Depends: Octave ( >= 3.2.0 ) Autoload: NO -License: GPL version 3 or later +License: GPL-3 diff --git a/tests/files/octave-forge/language/language1/language1-0.0.1.DESCRIPTION b/tests/files/octave-forge/language/language1/language1-0.0.1.DESCRIPTION index b11207a..6ad3731 100644 --- a/tests/files/octave-forge/language/language1/language1-0.0.1.DESCRIPTION +++ b/tests/files/octave-forge/language/language1/language1-0.0.1.DESCRIPTION @@ -13,4 +13,4 @@ SystemRequirements: pkg1 ( >= 4.3.2 ), pkg2 ( <1.2.3 ), pkg3 BuildRequires: pkg4 ( >1.0.0 ) Depends: Octave ( >= 3.2.0 ) Autoload: NO -License: GPL version 3 or later +License: GPL-3 diff --git a/tests/files/octave-forge/language/language2/language2-0.0.1.DESCRIPTION b/tests/files/octave-forge/language/language2/language2-0.0.1.DESCRIPTION index bccdf4f..7bc64df 100644 --- a/tests/files/octave-forge/language/language2/language2-0.0.1.DESCRIPTION +++ b/tests/files/octave-forge/language/language2/language2-0.0.1.DESCRIPTION @@ -13,4 +13,4 @@ SystemRequirements: pkg5 ( >= 4.3.2 ), pkg6 ( <1.2.3 ), pkg7 BuildRequires: pkg8 ( >1.0.0 ) Depends: Octave ( >= 3.2.0 ) Autoload: NO -License: GPL version 3 or later +License: GPL-3 diff --git a/tests/files/octave-forge/language/language2/language2-0.0.2.DESCRIPTION b/tests/files/octave-forge/language/language2/language2-0.0.2.DESCRIPTION index 6855a7f..28492a1 100644 --- a/tests/files/octave-forge/language/language2/language2-0.0.2.DESCRIPTION +++ b/tests/files/octave-forge/language/language2/language2-0.0.2.DESCRIPTION @@ -13,4 +13,4 @@ SystemRequirements: pkg5 ( >= 4.3.2 ), pkg6 ( <1.2.3 ), pkg7 BuildRequires: pkg8 ( >1.0.0 ) Depends: Octave ( >= 3.2.0 ) Autoload: NO -License: GPL version 3 or later +License: GPL-3 diff --git a/tests/files/octave-forge/main/main1/main1-0.0.1.DESCRIPTION b/tests/files/octave-forge/main/main1/main1-0.0.1.DESCRIPTION index 537b450..42eae6d 100644 --- a/tests/files/octave-forge/main/main1/main1-0.0.1.DESCRIPTION +++ b/tests/files/octave-forge/main/main1/main1-0.0.1.DESCRIPTION @@ -13,4 +13,4 @@ SystemRequirements: pkg1 ( >= 4.3.2 ), pkg2 ( <1.2.3 ), pkg3 BuildRequires: pkg4 ( >1.0.0 ) Depends: Octave ( >= 3.0.0 ) Autoload: NO -License: GPL version 3 or later +License: GPL-3 diff --git a/tests/files/octave-forge/main/main2/main2-0.0.1.DESCRIPTION b/tests/files/octave-forge/main/main2/main2-0.0.1.DESCRIPTION index 1a5499f..5ae76ef 100644 --- a/tests/files/octave-forge/main/main2/main2-0.0.1.DESCRIPTION +++ b/tests/files/octave-forge/main/main2/main2-0.0.1.DESCRIPTION @@ -13,4 +13,4 @@ SystemRequirements: pkg5 ( >= 4.3.2 ), pkg6 ( <1.2.3 ), pkg7 BuildRequires: pkg8 ( >1.0.0 ) Depends: Octave ( >= 3.2.0 ) Autoload: NO -License: GPL version 3 or later +License: GPL-3 diff --git a/tests/files/octave-forge/main/main2/main2-0.0.2.DESCRIPTION b/tests/files/octave-forge/main/main2/main2-0.0.2.DESCRIPTION index 5f6bebf..f4e763a 100644 --- a/tests/files/octave-forge/main/main2/main2-0.0.2.DESCRIPTION +++ b/tests/files/octave-forge/main/main2/main2-0.0.2.DESCRIPTION @@ -13,4 +13,4 @@ SystemRequirements: pkg5 ( >= 4.3.2 ), pkg6 ( <1.2.3 ), pkg7 BuildRequires: pkg8 ( >1.0.0 ) Depends: Octave ( >= 3.2.0 ) Autoload: NO -License: GPL version 3 or later +License: GPL-3 |