From f155878a27bf145184dd8b89270019891b494544 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Tue, 24 May 2016 00:52:25 +0200 Subject: [PATCH] updated ebuild for duplicati: Use provided Makefile, albeit patched to match the gentoo way of life. TODO: ony build requested localizations. for now, everything is built. --- app-backup/duplicati/Manifest | 4 +- app-backup/duplicati/duplicati-1.3.4.ebuild | 12 +++- .../duplicati-1.3.4-patch-Makefile.patch | 56 +++++++++++++++++++ ...icati-1.3.4-remove-unsigned-backends.patch | 20 +++++++ 4 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 app-backup/duplicati/files/duplicati-1.3.4-patch-Makefile.patch create mode 100644 app-backup/duplicati/files/duplicati-1.3.4-remove-unsigned-backends.patch diff --git a/app-backup/duplicati/Manifest b/app-backup/duplicati/Manifest index b833b40..ec26122 100644 --- a/app-backup/duplicati/Manifest +++ b/app-backup/duplicati/Manifest @@ -1,4 +1,6 @@ AUX duplicati-1.3.4-filenames-casesensitive.patch 3852 SHA256 2b21530fad665c56377041b2cd4403303e552d3396c27c720eef730c2ccce35a SHA512 b8a5b0993c484d358bcd0bd5619bce4bf991afadc2b4c393a0272900fbb5bc9112bf1a12ea92385538558b587ec3369ef0fce168d1ed04183f14c00582e88523 WHIRLPOOL 74d18427ce64d608b31d172cfcd3c95538cb971635f98b6cc67cc4df282cb0856f9864e23a6d1c12ff8237627241fb1a1e413f329f20722e70e6b20835c00495 +AUX duplicati-1.3.4-patch-Makefile.patch 2032 SHA256 29b6e0ca987c24622fb7562b791ee387e6b9e31f18d1e9733c89a5cf83d2db51 SHA512 b3a8dacb14a06a9b50747bc829b213a9d1f2af3b12583ca12ee51763ac73419cbb035860fd2ceef0cf41447c2e80c944b8655b5023fc7a87b2fe5364dd43062f WHIRLPOOL f21bd7262133fa25f77b2019092fa9560342f7a93ecf50d90086fd7744e4ef0176e433d77ae365ee888d63bde98b7233c3f7406d87cdd9e82ba6bb5457154e99 +AUX duplicati-1.3.4-remove-unsigned-backends.patch 1899 SHA256 cc962d1b4243d7f8a6f18f541eb9d6a503add0d95b67e384f1a611b875a7e973 SHA512 960e45e8f8bd0a59bbd1b9adb9f60758957916158b7e6609e5c3a7fdae4b120842ee14a8ae3152ca00999798c9c1e3bb953fcff4dc4e8d748d8942cb669c1090 WHIRLPOOL 9bb46c12dd8bf4298a59cba25616a05624f6eab2027ddbc43be1bf9cd617795d7fdcc2303e3e18f114d6daa2698560856dd3a00c4b11d243d8fd2a8cf7078cf5 DIST duplicati-1.3.4.tar.gz 11840281 SHA256 abae8876b536d4f1e63b07297ea0b26ad9a2026e46593be661d45f95d2348581 SHA512 e92c178715df0d6d5794720988ccb4342aaf9d6e92813316b7c9214364d7735eaeb178d2dc413a91acc3e7e7a1a4ba1821e8ef7989897a55add66f63adcbc7a5 WHIRLPOOL 3d1d70e44f662adb7e24324bc82bbfd1c9b8e6596136ffd69dec78cd60ecee908b604110e52ddc79104e071db97efc27bb30d45f78464043d11d1259b3672b6b -EBUILD duplicati-1.3.4.ebuild 618 SHA256 45f3ed6de21bd7e4e9d69c05092dfd0dc258b1e0bfe4b41c2a44b7e12e034dac SHA512 8043acc6dfdb414138afa5b74605336f70d270a462da19f03440469b1224f4bf1f856b0ae8f610cc8be083762dee5678a478d0cda3e252aceb3c093c81153858 WHIRLPOOL 667a2daeebf0b47fd3b1606cf8f3013416c8d5a90d512af3d0ac9986a727776aa07897722bb5bb8a2f9ed8cc8828fb9b1fbd9c2c52e28428df1a2242c21aff39 +EBUILD duplicati-1.3.4.ebuild 817 SHA256 1d40213b7751512d064b21aaf23476c152323e1dd178808f12552cb76493fbd1 SHA512 897c9463fc112a8f0e660ae1b3c1a10e1889eb3b9d60b41377588882a0871908d28a4316899095c7a416f6ba23cd09b12cc5866b8cc0e007b598dbb3610ae7aa WHIRLPOOL ebd63c6a56bd52d2b4a92129ca7ffe106bc2d7f78d71fd4cffe4228049c9731f7ea4ccc814485d89dd926d3ebba08068c3080da86eb8cc4b6de4a71e80a10898 MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1 diff --git a/app-backup/duplicati/duplicati-1.3.4.ebuild b/app-backup/duplicati/duplicati-1.3.4.ebuild index f6b12ef..e6159f0 100644 --- a/app-backup/duplicati/duplicati-1.3.4.ebuild +++ b/app-backup/duplicati/duplicati-1.3.4.ebuild @@ -20,14 +20,22 @@ RDEPEND="" PATCHES=( "${FILESDIR}/${P}-filenames-casesensitive.patch" + "${FILESDIR}/${P}-remove-unsigned-backends.patch" + "${FILESDIR}/${P}-patch-Makefile.patch" ) src_prepare() { - for p in ${PATCHES} ; do + for p in "${PATCHES[@]}" ; do epatch "${p}" done } src_compile() { - xbuild + cd ${S}/Installer/Makefile + emake translations +} + +src_install() { + cd ${S}/Installer/Makefile + emake package } diff --git a/app-backup/duplicati/files/duplicati-1.3.4-patch-Makefile.patch b/app-backup/duplicati/files/duplicati-1.3.4-patch-Makefile.patch new file mode 100644 index 0000000..e826abe --- /dev/null +++ b/app-backup/duplicati/files/duplicati-1.3.4-patch-Makefile.patch @@ -0,0 +1,56 @@ +diff --git a/Installer/Makefile/Makefile b/Installer/Makefile/Makefile +index 5528c7e..ba8e11f 100644 +--- a/Installer/Makefile/Makefile ++++ b/Installer/Makefile/Makefile +@@ -2,20 +2,14 @@ BUILD_TOOL=xbuild + BUILD_ARGS=/property:Platform=Any\ CPU /property:Configuration=Release + OUTPUT_ARGS=/property:OutputPath=bin/Release + SOURCE_DIR=../../. +-PACKAGE_DIR=./pkg ++PACKAGE_DIR=${D}/. + PKG_TARGET=$(PACKAGE_DIR)/usr/lib/duplicati + LOCALIZATION_TOOL=mono $(SOURCE_DIR)/Duplicati/Localization/LocalizationTool.exe + + all: package + +-Duplicati-v1.sln: +- patch -d "$(SOURCE_DIR)" -i patch-1-remove-scheduler -o Duplicati-v1.sln Duplicati.sln +- +-Duplicati-v2.sln: Duplicati-v1.sln +- patch -d "$(SOURCE_DIR)" -i patch-2-remove-unsigned-backends -o Duplicati-v2.sln Duplicati-v1.sln +- +-build: Duplicati-v2.sln +- $(BUILD_TOOL) $(BUILD_ARGS) "$(SOURCE_DIR)/Duplicati-v2.sln" ++build: ++ $(BUILD_TOOL) $(BUILD_ARGS) "$(SOURCE_DIR)/Duplicati.sln" + $(BUILD_TOOL) $(BUILD_ARGS) $(OUTPUT_ARGS) "$(SOURCE_DIR)/Duplicati/Library/Backend/SSH/Duplicati.Library.Backend.SSH.csproj" + $(BUILD_TOOL) $(BUILD_ARGS) $(OUTPUT_ARGS) "$(SOURCE_DIR)/Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj" + $(BUILD_TOOL) $(BUILD_ARGS) "$(SOURCE_DIR)/BuildTools/LocalizationTool/LocalizationTool.sln" +@@ -31,10 +25,6 @@ translations: build + $(LOCALIZATION_TOOL) build + + package: +- if [ -e "$(PACKAGE_DIR)" ]; then \ +- rm -rf "$(PACKAGE_DIR)"; \ +- fi +- mkdir "$(PACKAGE_DIR)" + mkdir "$(PACKAGE_DIR)/usr" + mkdir "$(PACKAGE_DIR)/usr/lib" + mkdir "$(PACKAGE_DIR)/usr/bin" +@@ -79,16 +69,6 @@ package: + + chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati" + chmod +x "$(PACKAGE_DIR)/usr/bin/duplicati-commandline" +- +- if [ -e "duplicati.tar" ]; then \ +- rm -rf "duplicati.tar"; \ +- fi +- if [ -e "duplicati.tar.gz" ]; then \ +- rm -rf "duplicati.tar.gz"; \ +- fi +- +- tar -C "$(PACKAGE_DIR)" -cf "duplicati.tar" . +- gzip --best "duplicati.tar" + + clean: + rm -rf "$(SOURCE_DIR)/Duplicati-v1.sln" diff --git a/app-backup/duplicati/files/duplicati-1.3.4-remove-unsigned-backends.patch b/app-backup/duplicati/files/duplicati-1.3.4-remove-unsigned-backends.patch new file mode 100644 index 0000000..bbd34b5 --- /dev/null +++ b/app-backup/duplicati/files/duplicati-1.3.4-remove-unsigned-backends.patch @@ -0,0 +1,20 @@ +--- Duplicati.sln.old 2011-12-06 18:21:00.000000000 +0100 ++++ Duplicati.sln 2011-12-06 20:15:33.000000000 +0100 +@@ -11,8 +11,6 @@ + EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.FTP", "Duplicati\Library\Backend\FTP\Duplicati.Library.Backend.FTP.csproj", "{F61679A9-E5DE-468A-B5A4-05F92D0143D2}" + EndProject +-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.SSH", "Duplicati\Library\Backend\SSH\Duplicati.Library.Backend.SSH.csproj", "{6BA21DCB-1701-4936-B177-3B6D4DE3474E}" +-EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Compression", "Duplicati\Library\Compression\Duplicati.Library.Compression.csproj", "{19ECCE09-B5EB-406C-8C57-BAC66997D469}" + EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Encryption", "Duplicati\Library\Encryption\Duplicati.Library.Encryption.csproj", "{94484FDB-2EFA-4CF0-9BE6-A561157B4F87}" +@@ -49,8 +47,6 @@ + EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Modules.Builtin", "Duplicati\Library\Modules\Builtin\Duplicati.Library.Modules.Builtin.csproj", "{52826615-7964-47FE-B4B3-1B2DBDF605B9}" + EndProject +-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.TahoeLAFS", "Duplicati\Library\Backend\TahoeLAFS\Duplicati.Library.Backend.TahoeLAFS.csproj", "{C0270709-2A40-43B5-8CF1-69581B9FA2A1}" +-EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.SkyDrive", "Duplicati\Library\Backend\SkyDrive\Duplicati.Library.Backend.SkyDrive.csproj", "{CCD76347-7DC7-4B42-B7E1-E500E624CAC3}" + EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.GoogleDocs", "Duplicati\Library\Backend\GoogleDocs\Duplicati.Library.Backend.GoogleDocs.csproj", "{42C91180-11EB-4590-82EA-80FE9D4DEBEC}"