diff --git a/portage/dev-util/7zip-920/7zip-920.py b/portage/dev-util/7zip-920/7zip-920.py new file mode 100644 index 000000000..626b523b3 --- /dev/null +++ b/portage/dev-util/7zip-920/7zip-920.py @@ -0,0 +1,18 @@ +import info +from CraftVersion import CraftVersion + +class subinfo( info.infoclass ): + def setTargets( self ): + self.targets["920"] = "http://www.7-zip.org/a/7za920.zip" + self.targetInstallPath["920"] = os.path.join("dev-utils", "bin") + self.targetDigests["920"] = (['2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac'], CraftHash.HashAlgorithm.SHA256) + self.defaultTarget = "920" + +from Package.BinaryPackageBase import * + +class Package( BinaryPackageBase ): + def __init__( self ): + BinaryPackageBase.__init__( self ) + + def install( self ): + return utils.copyFile(os.path.join(self.sourceDir(), "7za.exe"), os.path.join(self.installDir(), "7za.exe")) diff --git a/portage/dev-util/7zip/7zip.py b/portage/dev-util/7zip/7zip.py index 9a4f36390..80938b7a0 100644 --- a/portage/dev-util/7zip/7zip.py +++ b/portage/dev-util/7zip/7zip.py @@ -1,25 +1,25 @@ import info from CraftVersion import CraftVersion class subinfo( info.infoclass ): def setTargets( self ): - self.targets["920"] = "http://www.7-zip.org/a/7za920.zip" - self.targetInstallPath["920"] = os.path.join("dev-utils", "bin") - self.targetDigests["920"] = (['2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac'], CraftHash.HashAlgorithm.SHA256) for ver in [ "1602", "1604"]: self.targets[ ver ] = f"http://www.7-zip.org/a/7z{ver}-extra.7z" self.targetInstallPath[ ver ] = os.path.join("dev-utils", "bin") self.targetDigests['1602'] = (['f6c412e8bc45e4a88e675976024c21ed7a23eeb7eb0af452aa7a9b9a97843aa2'], CraftHash.HashAlgorithm.SHA256) - self.defaultTarget = "1604" if utils.utilsCache.findApplication("7za") else "920" + self.defaultTarget = "1604" + + def setDependencies( self ): + self.buildDependencies["dev-util/7zip-920"] = "default" from Package.BinaryPackageBase import * class Package( BinaryPackageBase ): def __init__( self ): BinaryPackageBase.__init__( self ) def install( self ): - if compiler.isX64() and CraftVersion(self.subinfo.defaultTarget) > CraftVersion("920"): + if compiler.isX64(): return utils.copyFile(os.path.join(self.sourceDir(), "x64", "7za.exe"), os.path.join(self.installDir(), "7za.exe")) else: return utils.copyFile(os.path.join(self.sourceDir(), "7za.exe"), os.path.join(self.installDir(), "7za.exe"))