[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [emerge] portage: correct base and bin-base dependencies
From: Patrick Spendrin <ps_ml () gmx ! de>
Date: 2015-09-18 8:46:08
Message-ID: E1ZcrJ2-0002d6-Ff () scm ! kde ! org
[Download RAW message or body]
Git commit f65b4cd7fd52513d57a0501929339c1744072ed7 by Patrick Spendrin.
Committed on 18/09/2015 at 08:44.
Pushed by sengels into branch 'master'.
correct base and bin-base dependencies
the packages base and bin-base should never be runtime dependencies of a
package, unless for special packages
M +1 -1 portage/binary/gpg4win-e5/gpg4win-e5.py
M +1 -1 portage/contributed/gpg-wce-dev/gpg-wce-dev.py
M +1 -1 portage/contributed/minetest/minetest.py
M +1 -1 portage/dev-util/emerge/emerge.py
M +1 -1 portage/dev-util/pkg-config/pkg-config.py
M +1 -1 portage/kdesupport/qtscriptgenerator/qtscriptgenerator.py
M +1 -1 portage/testing/clang/clang.py
M +1 -1 portage/testing/gloox/gloox.py
M +1 -1 portage/testing/gnupg-src/gnupg-src.py
M +1 -1 portage/testing/libotr-src/libotr-src.py
M +1 -1 portage/testing/libplist-src/libplist-src.py
M +1 -1 portage/testing/libvncserver-src/libvncserver-src.py
M +1 -2 portage/testing/llvm/llvm.py
M +1 -1 portage/testing/mplayer/mplayer.py
M +1 -1 portage/testing/pinentry-qt/pinentry-qt.py
M +1 -1 portage/testing/pthreads-win32/pthreads-win32.py
M +1 -1 portage/testing/r-base/r-base.py
M +1 -1 portage/testing/regex/regex.py
M +1 -1 portage/testing/sip/sip.py
M +1 -1 portage/testing/testdisk/testdisk.py
M +1 -1 portage/testing/wincetools/wincetools.py
M +1 -1 portage/win32libs/glew/glew.py
M +1 -1 portage/win32libs/gsl/gsl.py
http://commits.kde.org/emerge/f65b4cd7fd52513d57a0501929339c1744072ed7
diff --git a/portage/binary/gpg4win-e5/gpg4win-e5.py \
b/portage/binary/gpg4win-e5/gpg4win-e5.py index 35617db..963459f 100644
--- a/portage/binary/gpg4win-e5/gpg4win-e5.py
+++ b/portage/binary/gpg4win-e5/gpg4win-e5.py
@@ -29,7 +29,7 @@ class subinfo(info.infoclass):
self.targetDigests[version] = '0e0c6ae454e85d682a7c88b95f95d37bd9f3b03d'
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
class Package(CMakePackageBase):
def __init__(self):
diff --git a/portage/contributed/gpg-wce-dev/gpg-wce-dev.py \
b/portage/contributed/gpg-wce-dev/gpg-wce-dev.py index ad53b47..f2c41cd 100644
--- a/portage/contributed/gpg-wce-dev/gpg-wce-dev.py
+++ b/portage/contributed/gpg-wce-dev/gpg-wce-dev.py
@@ -55,7 +55,7 @@ class subinfo(info.infoclass):
self.defaultTarget = '20110121'
def setDependencies( self ):
- self.dependencies['virtual/bin-base'] = 'default'
+ self.buildDependencies['virtual/bin-base'] = 'default'
class Package(BinaryPackageBase):
diff --git a/portage/contributed/minetest/minetest.py \
b/portage/contributed/minetest/minetest.py index a096db4..8570f89 100644
--- a/portage/contributed/minetest/minetest.py
+++ b/portage/contributed/minetest/minetest.py
@@ -5,7 +5,7 @@ from Package.CMakePackageBase import *
class subinfo(info.infoclass):
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
self.dependencies['win32libs/libvorbis'] = 'default'
self.dependencies['win32libs/openal-soft'] = 'default'
self.dependencies['win32libs/sqlite'] = 'default'
diff --git a/portage/dev-util/emerge/emerge.py b/portage/dev-util/emerge/emerge.py
index 43925eb..10d6934 100644
--- a/portage/dev-util/emerge/emerge.py
+++ b/portage/dev-util/emerge/emerge.py
@@ -8,7 +8,7 @@ class subinfo(info.infoclass):
self.defaultTarget = 'gitHEAD'
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
from Package.CMakePackageBase import *
from Source.SvnSource import *
diff --git a/portage/dev-util/pkg-config/pkg-config.py \
b/portage/dev-util/pkg-config/pkg-config.py index bded8fb..f9ee3c3 100644
--- a/portage/dev-util/pkg-config/pkg-config.py
+++ b/portage/dev-util/pkg-config/pkg-config.py
@@ -10,7 +10,7 @@ class subinfo( info.infoclass ):
self.defaultTarget = "0.28"
def setDependencies( self ):
- self.dependencies[ 'virtual/bin-base' ] = 'default'
+ self.buildDependencies[ 'virtual/bin-base' ] = 'default'
class Package( BinaryPackageBase ):
diff --git a/portage/kdesupport/qtscriptgenerator/qtscriptgenerator.py \
b/portage/kdesupport/qtscriptgenerator/qtscriptgenerator.py index 3ac0f2a..fe0b652 \
100644
--- a/portage/kdesupport/qtscriptgenerator/qtscriptgenerator.py
+++ b/portage/kdesupport/qtscriptgenerator/qtscriptgenerator.py
@@ -2,7 +2,7 @@ import info
class subinfo( info.infoclass ):
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
self.dependencies['libs/qt'] = 'default'
def setTargets( self ):
diff --git a/portage/testing/clang/clang.py b/portage/testing/clang/clang.py
index 7a0777e..0a63b8f 100644
--- a/portage/testing/clang/clang.py
+++ b/portage/testing/clang/clang.py
@@ -16,7 +16,7 @@ class subinfo(info.infoclass):
self.defaultTarget = releaseVersion
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
self.dependencies['testing/llvm'] = 'default'
from Package.CMakePackageBase import *
diff --git a/portage/testing/gloox/gloox.py b/portage/testing/gloox/gloox.py
index 7ff9b3b..5f746a0 100644
--- a/portage/testing/gloox/gloox.py
+++ b/portage/testing/gloox/gloox.py
@@ -2,7 +2,7 @@ import info
class subinfo(info.infoclass):
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
self.dependencies['win32libs/openssl'] = 'default'
self.dependencies['win32libs/zlib'] = 'default'
self.dependencies['win32libs/libidn'] = 'default'
diff --git a/portage/testing/gnupg-src/gnupg-src.py \
b/portage/testing/gnupg-src/gnupg-src.py index 0f3213a..ae64e95 100644
--- a/portage/testing/gnupg-src/gnupg-src.py
+++ b/portage/testing/gnupg-src/gnupg-src.py
@@ -13,7 +13,7 @@ class subinfo(info.infoclass):
self.options.package.withCompiler = False
def setDependencies( self ):
- self.dependencies['virtual/bin-base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
class Package(AutoToolsPackageBase):
def __init__( self, **args ):
diff --git a/portage/testing/libotr-src/libotr-src.py \
b/portage/testing/libotr-src/libotr-src.py index 461f389..3aec8a6 100644
--- a/portage/testing/libotr-src/libotr-src.py
+++ b/portage/testing/libotr-src/libotr-src.py
@@ -13,7 +13,7 @@ class subinfo(info.infoclass):
def setDependencies( self ):
self.dependencies['win32libs/gcrypt'] = 'default'
- self.dependencies['virtual/bin-base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
class Package(CMakePackageBase):
def __init__( self, **args ):
diff --git a/portage/testing/libplist-src/libplist-src.py \
b/portage/testing/libplist-src/libplist-src.py index 3ccb356..c6e3810 100644
--- a/portage/testing/libplist-src/libplist-src.py
+++ b/portage/testing/libplist-src/libplist-src.py
@@ -9,7 +9,7 @@ class subinfo(info.infoclass):
def setDependencies( self ):
self.dependencies['win32libs/libxml2'] = 'default'
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
class Package(CMakePackageBase):
def __init__( self, **args ):
diff --git a/portage/testing/libvncserver-src/libvncserver-src.py \
b/portage/testing/libvncserver-src/libvncserver-src.py index 9199aff..151be77 100644
--- a/portage/testing/libvncserver-src/libvncserver-src.py
+++ b/portage/testing/libvncserver-src/libvncserver-src.py
@@ -12,7 +12,7 @@ class subinfo(info.infoclass):
self.defaultTarget = '0.9.8.2'
def setDependencies( self ):
- self.dependencies['virtual/bin-base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
class Package(CMakePackageBase):
def __init__( self, **args ):
diff --git a/portage/testing/llvm/llvm.py b/portage/testing/llvm/llvm.py
index b5b9a6b..eb324e0 100644
--- a/portage/testing/llvm/llvm.py
+++ b/portage/testing/llvm/llvm.py
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
-from BuildSystem import CMakeBuildSystem
import info
class subinfo(info.infoclass):
@@ -22,7 +21,7 @@ class subinfo(info.infoclass):
self.options.configure.defines = '-DLLVM_TARGETS_TO_BUILD="X86"'
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
from Package.CMakePackageBase import *
diff --git a/portage/testing/mplayer/mplayer.py b/portage/testing/mplayer/mplayer.py
index 57b9a86..6642996 100644
--- a/portage/testing/mplayer/mplayer.py
+++ b/portage/testing/mplayer/mplayer.py
@@ -14,7 +14,7 @@ class subinfo(info.infoclass):
self.defaultTarget = '20100211'
def setDependencies( self ):
- self.dependencies['virtual/bin-base'] = 'default'
+ self.buildDependencies['virtual/bin-base'] = 'default'
class Package(BinaryPackageBase):
def __init__(self):
diff --git a/portage/testing/pinentry-qt/pinentry-qt.py \
b/portage/testing/pinentry-qt/pinentry-qt.py index 496ffcd..8512546 100644
--- a/portage/testing/pinentry-qt/pinentry-qt.py
+++ b/portage/testing/pinentry-qt/pinentry-qt.py
@@ -10,7 +10,7 @@ class subinfo(info.infoclass):
self.defaultTarget = 'gitHEAD'
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
self.dependencies['libs/qt'] = 'default'
from Package.CMakePackageBase import *
diff --git a/portage/testing/pthreads-win32/pthreads-win32.py \
b/portage/testing/pthreads-win32/pthreads-win32.py index 8dc9c8a..1352398 100644
--- a/portage/testing/pthreads-win32/pthreads-win32.py
+++ b/portage/testing/pthreads-win32/pthreads-win32.py
@@ -16,7 +16,7 @@ class subinfo(info.infoclass):
self.defaultTarget = '2.7.0'
def setDependencies( self ):
- self.dependencies['virtual/bin-base'] = 'default'
+ self.buildDependencies['virtual/bin-base'] = 'default'
class Package(BinaryPackageBase):
def __init__(self):
diff --git a/portage/testing/r-base/r-base.py b/portage/testing/r-base/r-base.py
index 46df1e9..51ecf4d 100644
--- a/portage/testing/r-base/r-base.py
+++ b/portage/testing/r-base/r-base.py
@@ -10,7 +10,7 @@ PACKAGE_PATH = '/bin/windows/base/'
class subinfo(info.infoclass):
def setDependencies( self ):
- self.dependencies['virtual/bin-base'] = 'default'
+ self.buildDependencies['virtual/bin-base'] = 'default'
def setTargets( self ):
self.targets['stable_latest'] = PACKAGE_CRAN_MIRROR + PACKAGE_PATH + \
'R-release.exe'
diff --git a/portage/testing/regex/regex.py b/portage/testing/regex/regex.py
index 3dae2cb..fec1f5d 100644
--- a/portage/testing/regex/regex.py
+++ b/portage/testing/regex/regex.py
@@ -16,7 +16,7 @@ class subinfo(info.infoclass):
self.defaultTarget = '3.8'
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/bin-base'] = 'default'
from Package.BinaryPackageBase import *
diff --git a/portage/testing/sip/sip.py b/portage/testing/sip/sip.py
index b600ba1..3d3aeaa 100644
--- a/portage/testing/sip/sip.py
+++ b/portage/testing/sip/sip.py
@@ -9,7 +9,7 @@ from Package.CMakePackageBase import *
class subinfo(info.infoclass):
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
def setTargets( self ):
self.targets['4.7.7'] = \
'http://www.winkde.org/pub/kde/ports/win32/repository/external/sip-4.7.7.zip'
diff --git a/portage/testing/testdisk/testdisk.py \
b/portage/testing/testdisk/testdisk.py index 2547bbe..b119a92 100644
--- a/portage/testing/testdisk/testdisk.py
+++ b/portage/testing/testdisk/testdisk.py
@@ -8,7 +8,7 @@ class subinfo(info.infoclass):
self.defaultTarget = 'gitHEAD'
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
from Package.CMakePackageBase import *
diff --git a/portage/testing/wincetools/wincetools.py \
b/portage/testing/wincetools/wincetools.py index 1b4d163..d54c736 100644
--- a/portage/testing/wincetools/wincetools.py
+++ b/portage/testing/wincetools/wincetools.py
@@ -12,7 +12,7 @@ class subinfo(info.infoclass):
self.defaultTarget = 'kdepimcetools'
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
from Package.CMakePackageBase import *
diff --git a/portage/win32libs/glew/glew.py b/portage/win32libs/glew/glew.py
index 4ae0b37..6ebe6ca 100644
--- a/portage/win32libs/glew/glew.py
+++ b/portage/win32libs/glew/glew.py
@@ -20,7 +20,7 @@ class subinfo(info.infoclass):
self.defaultTarget = '1.10.0'
def setDependencies( self ):
- self.dependencies['virtual/base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
class Package(CMakePackageBase):
def __init__( self, **args ):
diff --git a/portage/win32libs/gsl/gsl.py b/portage/win32libs/gsl/gsl.py
index 8432312..1fe6e1b 100644
--- a/portage/win32libs/gsl/gsl.py
+++ b/portage/win32libs/gsl/gsl.py
@@ -8,7 +8,7 @@ class subinfo(info.infoclass):
self.defaultTarget = '1.16'
def setDependencies( self ):
- self.dependencies['virtual/bin-base'] = 'default'
+ self.buildDependencies['virtual/base'] = 'default'
from Package.CMakePackageBase import *
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic