From 0b71901875857dfe399f85619e90f72c25a0f0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Deckert?= Date: Wed, 26 Mar 2025 18:25:11 +0100 Subject: [PATCH] app-emulation/open-vmdk: version bump --- app-emulation/open-vmdk/Manifest | 5 ++-- .../open-vmdk/files/diskinfo-20211104.patch | 26 ------------------- ...0211104.ebuild => open-vmdk-0.3.11.ebuild} | 13 +--------- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 app-emulation/open-vmdk/files/diskinfo-20211104.patch rename app-emulation/open-vmdk/{open-vmdk-20211104.ebuild => open-vmdk-0.3.11.ebuild} (67%) diff --git a/app-emulation/open-vmdk/Manifest b/app-emulation/open-vmdk/Manifest index 048c03d..8e93708 100644 --- a/app-emulation/open-vmdk/Manifest +++ b/app-emulation/open-vmdk/Manifest @@ -1,3 +1,2 @@ -AUX diskinfo-20211104.patch 701 BLAKE2B 5f9d03a2154f0b21d1e83eeeb340c4512394558668f7d119ce8616c5021ff2f5fc3da5b21e0e4bd9c4defd66f6d00e6647fe81973fdb6f8c2b99682861a0fb74 SHA512 f5895dd293bfdb58dd87d9540fd05cc39018620284fef8c08b2bcc09da3a4aa319ed0451ee1d8f8a3c405d7cfb262b59a5845873cf216093583593aafa2fe512 -DIST open-vmdk-20211104.zip 47295 BLAKE2B 52e656c2ffd4ca88c2cb598225ce0e6f08415e683078ea77ef5cd7045ae766582a47acbb70e7dab8649f812f768b5671d32e1b3bc0f48ce2673607a1035a97ee SHA512 604e722146ca39cd932824c0a2d35c467bc1b931d9ff16022c48d2840b48c3731b49629584497d0d98437d406febb6a2ccc5ee4278c08708782fc13280031ca4 -EBUILD open-vmdk-20211104.ebuild 842 BLAKE2B 02b8be909e3c2a486b75bb8a447eaed34b949d666a593fe982afc162aaca9b91cce2584d5244e1388659f560f6ac754ea08f1129da03f0c47fc7d496eeb08e2b SHA512 f94b10c3497822f1219b328e8597cf461638394699006e9a257f4d2a34c01bce7d9c348b39fbb994ec3dcb4f3179805451ac057dc403174334a3b5aaf9d2f08f +DIST open-vmdk-0.3.11.tar.gz 62059 BLAKE2B e42d5674a1cd6beb8f155a5f30c7b260f58dc0d4ea502d387a2173e4ac23cff88bcaf21c2e57c5c15e9a6273e1ce2b8df4bf86a2b1d37bc4e4f8a38a8f1282a5 SHA512 e9ece44aed19baa139ad8c58a93c32d62d8121b4660f553688bdd8b77cb30a86905199984e21ba82e4638f3bc0a2c1d612feb91a8adeda8ff486bba951f405ec +EBUILD open-vmdk-0.3.11.ebuild 656 BLAKE2B a5092e059742bc7b44b7020420edf2af0c1a9cd560a28fbb554ba39ff4ebd738d1be7823118a3ffc87a825ef5e860c6c497c2bf9ed29c892fa527c942f956948 SHA512 386c9e274b8047375982883d7a2602a8728384fd4bb735ed8b31e5e4cba5615ee226ede6e8ccba5a08c359a0fbd5856b87cafa6b9b63bee0007a8b0c170bd398 diff --git a/app-emulation/open-vmdk/files/diskinfo-20211104.patch b/app-emulation/open-vmdk/files/diskinfo-20211104.patch deleted file mode 100644 index 195b66b..0000000 --- a/app-emulation/open-vmdk/files/diskinfo-20211104.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/vmdk/diskinfo.h b/vmdk/diskinfo.h -index 2b58f43..f4f9441 100644 ---- a/vmdk/diskinfo.h -+++ b/vmdk/diskinfo.h -@@ -35,7 +35,7 @@ struct DiskInfo { - const DiskInfoVMT *vmt; - }; - --char *toolsVersion; /* toolsVersion in metadata */ -+extern char *toolsVersion; /* toolsVersion in metadata */ - - DiskInfo *Flat_Open(const char *fileName); - DiskInfo *Flat_Create(const char *fileName, off_t capacity); -diff --git a/vmdk/mkdisk.c b/vmdk/mkdisk.c -index b6c0cc9..b66b7d5 100644 ---- a/vmdk/mkdisk.c -+++ b/vmdk/mkdisk.c -@@ -24,6 +24,8 @@ - #include - #include - -+char *toolsVersion; /* toolsVersion in metadata */ -+ - static int - copyData(DiskInfo *dst, - off_t dstOffset, diff --git a/app-emulation/open-vmdk/open-vmdk-20211104.ebuild b/app-emulation/open-vmdk/open-vmdk-0.3.11.ebuild similarity index 67% rename from app-emulation/open-vmdk/open-vmdk-20211104.ebuild rename to app-emulation/open-vmdk/open-vmdk-0.3.11.ebuild index 2a7ee70..2ca9e01 100644 --- a/app-emulation/open-vmdk/open-vmdk-20211104.ebuild +++ b/app-emulation/open-vmdk/open-vmdk-0.3.11.ebuild @@ -2,15 +2,13 @@ EAPI="8" -COMMIT="875f4162c91c7fc7bc450dccaf7b896a927fa42b" - PYTHON_COMPAT=( python3_{7,8,9,10,11,12,13} ) inherit python-r1 DESCRIPTION="Convert VMware .vmdk images, build .ovf and .ova" HOMEPAGE="https://github.com/vmware/open-vmdk" -SRC_URI="https://github.com/vmware/open-vmdk/archive/${COMMIT}.zip -> ${P}.zip" +SRC_URI="https://github.com/vmware/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 x86" LICENSE="Apache-2.0" @@ -21,18 +19,9 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS}" DEPEND=${RDEPEND} -S=${WORKDIR}/${PN}-${COMMIT} - -PATCHES=( - "${FILESDIR}/diskinfo-${PV}.patch" -) - src_install() { emake DESTDIR="${D}" install || die "install failed" newbin ovf/mkovf.py mkovf || die "newbin failed" python_replicate_script "${ED}"/usr/bin/mkovf || die "python_replicate_script failed" - - insinto /usr/share/${PN} - doins ova/template* }