From 54c42eb42df420f52e032fcba7727c326ef01094 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 5 Nov 2022 09:17:35 +0000 Subject: gentoo auto-resync : 05:11:2022 - 09:17:35 --- net-misc/Manifest.gz | Bin 55212 -> 55209 bytes net-misc/modemmanager/Manifest | 2 +- net-misc/modemmanager/modemmanager-1.18.12.ebuild | 2 +- net-misc/networkmanager/Manifest | 2 +- .../networkmanager/networkmanager-1.40.2.ebuild | 2 +- net-misc/nx/Manifest | 3 +- .../nx/files/nx-3.5.99.26-riscv64-support.patch | 64 +++++++++++++++++ net-misc/nx/nx-3.5.99.26.ebuild | 4 +- net-misc/vde/Manifest | 9 +-- net-misc/vde/metadata.xml | 1 + net-misc/vde/vde-2.3.2_p20191011-r1.ebuild | 2 +- net-misc/vde/vde-2.3.2_p20191011.ebuild | 79 --------------------- net-misc/vde/vde-2.3.3.ebuild | 71 ++++++++++++++++++ net-misc/vde/vde-9999.ebuild | 75 +++++++++---------- 14 files changed, 185 insertions(+), 131 deletions(-) create mode 100644 net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch delete mode 100644 net-misc/vde/vde-2.3.2_p20191011.ebuild create mode 100644 net-misc/vde/vde-2.3.3.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index adef7cb4fd64..e7a648af48dc 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index bd9a704c9463..176cbb816430 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -3,5 +3,5 @@ AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e9149 DIST ModemManager-1.18.10.tar.xz 2611480 BLAKE2B ca6c690f2365917b5c879c1bd80ec2752880fb4ffe779c0dae7e2b0852d5f77bb403b5cc1f529e254818fd3e6df2698cd77493d801f5c55d5fe60c817df1e713 SHA512 4615ddb852b750ba0ca62224b669145a408a22b841937d42271638a73bf59dff5fb8b73553388afee8e7d2b2126c61f51af3f8fcb4475a2e2ea313d438443f9b DIST ModemManager-1.18.12.tar.xz 2589020 BLAKE2B e82db0a62d29753e22b9f9c09e60d8f5dca070cbac27b6df54ff8cd166cbb837dca3b162ac06afea0e75abdc8d407253a28cee58dacd739d4b485fa9f5485acb SHA512 7ee3b091ca2350a1d52f1ff0c0657c9f279594ffbff5ea57be59ca024331cafbac34901ca9ed4ef2b71e8c51b594526f921d3aeee6e8748cd0532a16218c5d6c EBUILD modemmanager-1.18.10-r1.ebuild 4126 BLAKE2B dd2403ed41d414cdb23b4797a60b916e585acadaddda8e2cf9ca77f041d87852d65dbd21764465ef8a454d93d732528a181536c4fce1aa72917abd2b92c3e536 SHA512 01e8fb11dd7bbc598cea707c50ff7c947204b60322a8fe39d618f3abba4947ebb4f7b691efe0f3010288c380c94dd39f889cad2ed03d0d0f86839b1596cfb5e1 -EBUILD modemmanager-1.18.12.ebuild 4132 BLAKE2B 996b7614698580027fa98c1edb4d86784caa33853fcd99b9194b586b988eb3dc4a680b97e3aba69b7ff3caea3711731e076521087544ab669eee5e22fd874f6c SHA512 65c4aa830049d752e3d3a4cb0a2b772fc9bdbe90972361fe3a964417da90742f99563d669d2c26eb47e213e0f596c697d8214464e70f0ee2a34d61669bb949aa +EBUILD modemmanager-1.18.12.ebuild 4131 BLAKE2B c45a18e374a30ff78bf854cca78869640affadbcad46a1724944e80661af807da65a7c5bd3eedf4d7f7b6ec50d38efd81537d27b225fe880886b7ab8edee05c8 SHA512 5d224d37b1bfbae8d7cb1c6c025f23433562bf75cae71f23e765cab9958fe22223571b8472aeaa909f5583305e3feb34094bbcb2b7c3fd386b868f83165af520 MISC metadata.xml 644 BLAKE2B 7805fa5c0d2371193d85e2129cf717315654a8c965f3cbef44985a56ada40e2f15752fd1818c7d03cc20ae6c34e3fd0d998c5e2637205e43e662f9352351e5fe SHA512 8c93bfeb1ac6b1c73039d89355f061fcf04491195149efe06f3655a663c03fbd5be3465509d80d8270642565abba9c1fa408276210a05a3093d95c93ed1352b6 diff --git a/net-misc/modemmanager/modemmanager-1.18.12.ebuild b/net-misc/modemmanager/modemmanager-1.18.12.ebuild index 4fa1d85c102e..86a9e3c39c60 100644 --- a/net-misc/modemmanager/modemmanager-1.18.12.ebuild +++ b/net-misc/modemmanager/modemmanager-1.18.12.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta LICENSE="GPL-2+" SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="elogind +introspection mbim policykit +qmi +qrtr systemd test +udev vala" REQUIRED_USE=" diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 309956d70c56..94494ead08eb 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -7,5 +7,5 @@ DIST NetworkManager-1.40.0.tar.xz 6580984 BLAKE2B 7c5288afd791dbf02af783540cc6c3 DIST NetworkManager-1.40.2.tar.xz 6585760 BLAKE2B 12bd809e0d5140ecb1f52f61680fbd21044350d0c265bfff2ac812f977a7db5c5342a0302b6f02b057ce675ab917f449106e4bb1bb9b1d187066e076785ed951 SHA512 b79119d11ad98262a22a3f78a7dfa979a7890682f97ed8154552f7ceb964402fc9c2dcda082bf80ba45d7f717f541d3145e40f7f6c4fbb8f2858272cc9505761 EBUILD networkmanager-1.38.4.ebuild 12537 BLAKE2B 8af417bbd3f64c646ed02434062d19a589cd689af48f1859a27e7779bf015ee53379a7282c0169d9e92b8e7ac6cde236f124ec458933d28161651bec161aeb77 SHA512 916840e7a60a301e1c15f191254fcd5c981707d6baffc4aef85956d93dd1268a1e009384c0581c96548a9aaede52bf22d3b71e58e86e6ae9fc0a6d25e9bda77b EBUILD networkmanager-1.40.0.ebuild 12497 BLAKE2B 244a43b0f6fc4aadf989fef6174f150ccfc59ee4c6566895537183269b263054cb36d9aeb15b1e96f15e13a812792cd62f2d585dba792658c212ab1c54db2750 SHA512 3de86bd3b2d9469c35290cda0a6170cfd01d9a4fbb933da7653259f02bf67700e40375ac32cd9cf3eed6b7d03f5e1a6c1148a71edd8ec82ce56e54b54c97d63a -EBUILD networkmanager-1.40.2.ebuild 12497 BLAKE2B 244a43b0f6fc4aadf989fef6174f150ccfc59ee4c6566895537183269b263054cb36d9aeb15b1e96f15e13a812792cd62f2d585dba792658c212ab1c54db2750 SHA512 3de86bd3b2d9469c35290cda0a6170cfd01d9a4fbb933da7653259f02bf67700e40375ac32cd9cf3eed6b7d03f5e1a6c1148a71edd8ec82ce56e54b54c97d63a +EBUILD networkmanager-1.40.2.ebuild 12496 BLAKE2B 90cf4f560e1f5a14b167329f95cf8f826dee77b0c13098415dae5b96c4e0817248a974926fc883d0d0249a0a92d5129ddb1d87b5998287d364a30a42da5ef691 SHA512 491345eea0f5943a43ecaee7364ee2ce3a41e5323c3c0c3440e4a0329aca548cf2b0f0938e1b7335cfc57b8d1363fb5772af3d529d7e7c0bc7ef9c2ea1f1b3eb MISC metadata.xml 2430 BLAKE2B 564983bc42e2b87533286f90ad5e3988356169cf65436ec853a63183ae1086e5672afd7552c9a06fd17018158bab09acaedf015998eb4d10a9c11db1897b49a4 SHA512 39ae015637e571dc8268c750a6cf56c185a0716113670f58e4d33848c7d6c33b8decba6201a0600ab689d2bcc7d44a123003bcfc8696fd8b46eea376b498d6e2 diff --git a/net-misc/networkmanager/networkmanager-1.40.2.ebuild b/net-misc/networkmanager/networkmanager-1.40.2.ebuild index b34c9b9ac16d..a73a22a8dac9 100644 --- a/net-misc/networkmanager/networkmanager-1.40.2.ebuild +++ b/net-misc/networkmanager/networkmanager-1.40.2.ebuild @@ -29,7 +29,7 @@ REQUIRED_USE=" ?? ( syslog systemd ) " -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" COMMON_DEPEND=" sys-apps/util-linux[${MULTILIB_USEDEP}] diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest index 65840bc9de56..ec63f50cbc72 100644 --- a/net-misc/nx/Manifest +++ b/net-misc/nx/Manifest @@ -1,6 +1,7 @@ AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3db393da2d20aa90cd5da68520c90b20b608c8a247ef0c85ee8f501907fe45c3b68d7c122b133c14a37d90599bcf132b22a2 SHA512 f767cb459f82c5f69fd957b42f04c51fff5fb583a2f1b47edb14a33654f5e36b8371fa9ca886fbf13ef780e403af089c055349b21f0f1cb154bb82e32980bcb3 +AUX nx-3.5.99.26-riscv64-support.patch 2204 BLAKE2B a52c4bf54edb09a73d86ecaf6daf5aeff820493c927fb6277fac4d7f514117d2f55eb38bf81539af4b8793b439ff78772cda819979e0b144b69f0d272664ba90 SHA512 a7ebfd63a54436e61c895c43290f805833d1f704b1e17cdff6607239dc84cc08cd8bcab0a5e1154ffa8bde3d28e2482d9ecf9d6697c23df6f29797b7447fc052 DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004 DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211 EBUILD nx-3.5.99.25.ebuild 3394 BLAKE2B d74d201f993e24e2313b9f90f2a20ea65fbdfdc3752d28cd4cb518c5f016eb270f86d35eac8b5c58c6f32a0a6cd6c75ca06a27af2c228d28afc31e47210a7459 SHA512 01d974b6eea37e3c3e7f9a0bf7245fa30a79ce674139d5ac066ab2b295d75b48232200034d4ae030147e3539f2f747c147a017da0766dbfb1ac2e3c18f0aa128 -EBUILD nx-3.5.99.26.ebuild 3520 BLAKE2B e3a93dc274558889edb7be3eb23cd3ea9d967ae60d8c81913054034b8bc0bbf9c415ac81273529129b5b65ff92e013496f9c8cb7e718f33cd800f1879e80a326 SHA512 679b7eceabf5ad82cd828b436a58cd46538038f297ca1dd32d4214560cda69b9e564d19319c93bf7d586aa3d3d4b9718f8ad79d7727e8e8f8e03fe31d1e31d16 +EBUILD nx-3.5.99.26.ebuild 3635 BLAKE2B 385e0c3b92d179522e8396e82fcdbd9304805dbf10174e0fb7ee6900d163cf8b4d4afdfef1fa34aaaa7e9e16cf07b9c90d1ef89035108ce6c32c2aca9e8ab60c SHA512 25a550a078e88a23f9856b6d267fde21a24f4e999e170834a049593e4ed508cbcd8b97062b2cd29f52240dfe52bb820299b0b86f116b3216a58daa47e313638c MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd diff --git a/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch b/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch new file mode 100644 index 000000000000..79ef8b9b5f18 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.99.26-riscv64-support.patch @@ -0,0 +1,64 @@ +From 460562852eb4b1e14d2eeb81d2b96ea5de6ef683 Mon Sep 17 00:00:00 2001 +From: Alexandre Ghiti +Date: Fri, 10 Sep 2021 08:51:53 +0200 +Subject: [PATCH] nx-X11: Add support for riscv64 architecture + +Signed-off-by: Xin Yang +--- + nx-X11/config/cf/Imake.cf | 5 +++++ + nx-X11/config/cf/Imake.tmpl | 2 ++ + nx-X11/config/cf/linux.cf | 9 +++++++++ + 3 files changed, 16 insertions(+) + +diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf +index 9d683b85..612bc4e3 100644 +--- a/nx-X11/config/cf/Imake.cf ++++ b/nx-X11/config/cf/Imake.cf +@@ -878,6 +878,11 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686 + # undef __powerpc64__ + # undef tmp_set_big_endian + # endif ++# ifdef __riscv ++# if __riscv_xlen == 64 ++# define Riscv64Architecture ++# endif ++# endif + # ifdef sparc + # define SparcArchitecture + # undef sparc +diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl +index de1fca93..266be8c5 100644 +--- a/nx-X11/config/cf/Imake.tmpl ++++ b/nx-X11/config/cf/Imake.tmpl +@@ -509,6 +509,8 @@ XCOMM the platform-specific parameters - edit site.def to change + #define ByteOrder X_BIG_ENDIAN + #elif defined(Ppc64LeArchitecture) + #define ByteOrder X_LITTLE_ENDIAN ++#elif defined(Riscv64Architecture) ++#define ByteOrder X_LITTLE_ENDIAN + #elif defined(HPArchitecture) + #define ByteOrder X_BIG_ENDIAN + #elif defined(SuperHArchitecture) +diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf +index c3e9eaaf..6851be55 100644 +--- a/nx-X11/config/cf/linux.cf ++++ b/nx-X11/config/cf/linux.cf +@@ -783,6 +783,15 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) + # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines + #endif /* PpcArchitecture */ + ++#ifdef Riscv64Architecture ++# ifndef OptimizedCDebugFlags ++# define OptimizedCDebugFlags -O3 ++# endif ++# define LinuxMachineDefines -D__riscv64__ ++# define ServerOSDefines XFree86ServerOSDefines ++# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 ++#endif /* Riscv64Achitecture */ ++ + #ifdef s390Architecture + # ifndef OptimizedCDebugFlags + # define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs +-- +2.38.1 + diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild index 7ac98b56e98d..2e50edab9c33 100644 --- a/net-misc/nx/nx-3.5.99.26.ebuild +++ b/net-misc/nx/nx-3.5.99.26.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-li LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc x86" +KEYWORDS="amd64 ~arm64 ~ppc ~riscv x86" RDEPEND="dev-libs/libxml2 >=media-libs/libpng-1.2.8:0= @@ -45,6 +45,8 @@ S="${WORKDIR}/nx-libs-${PV}" PATCHES=( # https://github.com/ArcticaProject/nx-libs/pull/1012 "${FILESDIR}/${PN}-3.5.99.26-binutils-2.36.patch" + # https://github.com/ArcticaProject/nx-libs/pull/1023 + "${FILESDIR}/${PN}-3.5.99.26-riscv64-support.patch" ) src_prepare() { diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest index a84693e2fc58..0a0d0e677745 100644 --- a/net-misc/vde/Manifest +++ b/net-misc/vde/Manifest @@ -5,9 +5,10 @@ AUX vde-2.3.2-slibtool-support.patch 1583 BLAKE2B 6667d3a5d158a72b43576e81340562 AUX vde.conf-r1 341 BLAKE2B b61648c4559e7fdc240ce7c82da6a0c0d53c4a94637ab0a4fd0d30e80306e6006c9242b9967f5fa6100c05efe2f4eb317ee55a05fbb3a4d79030fc14ea6ac61b SHA512 5aa5a52fb150f54672465b36dd215dc24e45f60015bf7afc4b376e046093089c656db642a4d8c4a98205cd0c453427e38ecc3c36cab79bf5f9d2936c61c914df AUX vde.init-r1 1021 BLAKE2B cf91532a53a59fb653b3c9c221ce68a4351a40503dedb28e89b5b28b582ec557f48f46aaa5ab5aad2d911ef19802fb3bec820dee79af533faf99aa9992c402f1 SHA512 a89251f3bccc7eb7332cb54d60a0590fd0d6eef556718d650b14da9ca80ef84c22fae0cdf0d89d83de2b616b0b5dac97bbe6551701d2a2df4093a00cb8e1d3fc DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971 +DIST vde-2.3.3.tar.gz 234790 BLAKE2B e3ed7423edc03a6af09967484613c0e2a701f74a4323eeab720cabe9a899120023425527054662ee1dbd207327b7e6dd375bceb4999fd708666df13c08acf348 SHA512 d0495aa700984dcc82f85cf7c8125cc10505a8a077fceec45b7fd2bec9c389966381682842e886469fa49239badd9442403d091c2ae5282685085e8262396387 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6 EBUILD vde-2.3.2-r6.ebuild 1407 BLAKE2B 639dd926dc7bcfde76216470b381cec847f7a7369e18b359d614f8edde3e3570cab2ab6416cc312f316a962d3cfd028a136209a607338b48a6cc318cb367b9c4 SHA512 852218c41c305ab7ae013c674c3b3194fbb03895377e37ef0b203611b8e1f1a68bfa5d6ea5bd5fef16afc82ac0706f431afaa3f98dc421d19dd7f8673585e2ac -EBUILD vde-2.3.2_p20191011-r1.ebuild 2044 BLAKE2B 56b2f6f1c4573e3cf3d54b05e2b56d9559f1118f30ce583e5db181185c26bf12d58f0e1bf0a5540b53bb1060cbde18c3a7ab2c7fb3bffac49b98b81bb30ac752 SHA512 8759e5d336e62cfb318f37feda6f290cf1107289ddfe7046ce297048f808e16656b5bf2cc13ed8a42e4953fc08a303581e929d668c51395911dfa97c8c630c6c -EBUILD vde-2.3.2_p20191011.ebuild 1967 BLAKE2B 2435594c7f62fb10476d0a9ded2352096f5bd4ff5b7bcd9953ce27926ea8b2c57a51ec7739162dced5abcedf589db795ffe583b280ac4cdd825bcbd4959ba770 SHA512 5f9cb5597d05fcd02636b5b318c6904fad10c06fb9ccfb568ca1bc8927bf05e2e4ea9137b3b2863dc58177ce99ce643754bd55f48f2d2f176aade1af87d85b1e -EBUILD vde-9999.ebuild 1924 BLAKE2B 5a3ceff00f2c858d35696a6ee1ef80a7a3db12c0ffe44b07da5089424e0bb3768138dbb6fab7de64c1491844f90c178d1b117b4db3f6dc29140ffbef2023fcec SHA512 490dcf752cf332d7947515f7348acce13b1f53793732ce354d9684470901e37d2d07befd88dd6b552f773fe2e45e95a5037f1224167c9720c082c1c2745c9992 -MISC metadata.xml 505 BLAKE2B 73469b5806d6d8f478c8754ab665071e424f0abc6f29859b47a263bbf3f2d83183afdbe8945201a8914a3c0bcee62371c742ba37b7ea362bbee37eff1674a898 SHA512 f954316274ecbde477990fe93a49faebed3bee214a64fb45438394345bee883cf6b9b3898715500498ebe7346793e34fa8bf38e24b797e229277cbc7aeaba2a1 +EBUILD vde-2.3.2_p20191011-r1.ebuild 2041 BLAKE2B d08960b451fec859d2cdf4e7e2422113d9c818f153378aa22b90a4bdfb5adf56569df53137f98e5ef5d9057af15e8ec3593b6af980ac2e9b9dba29c9bb4e47f3 SHA512 3e8c99bab95734530edd29a42b4768305a12ea5e567db721cc927195e1300533fa76494e7b1fadf1a624374f2e16fb617cf614db0e33c6e295e5fb0bc9e7e31a +EBUILD vde-2.3.3.ebuild 1704 BLAKE2B 90c04f4e50be6ab68055c51a2d597bed497faf27ed08adc115712afdd708e0f3d313edab68fc8610107d6ba3640696ceeb3852d47224648ee43020975f7e71f1 SHA512 28b14f637cffc78b76cb1746a6c418aae02df588a4b40f5e2aaaa11bc9af35bee78acda196c366bd08be409709af6eabe918cbab72ccb501e012927955d8a9f8 +EBUILD vde-9999.ebuild 1704 BLAKE2B 90c04f4e50be6ab68055c51a2d597bed497faf27ed08adc115712afdd708e0f3d313edab68fc8610107d6ba3640696ceeb3852d47224648ee43020975f7e71f1 SHA512 28b14f637cffc78b76cb1746a6c418aae02df588a4b40f5e2aaaa11bc9af35bee78acda196c366bd08be409709af6eabe918cbab72ccb501e012927955d8a9f8 +MISC metadata.xml 566 BLAKE2B 5f22e7e7ead240023dfa4049c23dab6b7c5a5a2ce264736deb3008d9ea66cf4d6fa022273ca8980e8091402c786e9c4e9d09252bababda1c3d0600cb783dda28 SHA512 d35a52d060009bfae1262fe1a1ada7d0987fb654d8a43322ee3af7e8002290323a600c5f900a2c0a1299349e214b8ee88f37b88f4637cc2d0fe86e1f45bb1403 diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml index bf886246ff69..8284456aa7c7 100644 --- a/net-misc/vde/metadata.xml +++ b/net-misc/vde/metadata.xml @@ -14,5 +14,6 @@ vde + virtualsquare/vde-2 diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild index b8cab1c90092..7d2b3d4ca431 100644 --- a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild +++ b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild @@ -13,7 +13,7 @@ elif [[ ${PV} = *_p* ]]; then MY_PN="vde-2" COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~loong ~ppc ppc64 ~riscv ~x86" S="${WORKDIR}/${MY_PN}-${COMMIT}" else diff --git a/net-misc/vde/vde-2.3.2_p20191011.ebuild b/net-misc/vde/vde-2.3.2_p20191011.ebuild deleted file mode 100644 index abd8c9c4d9f3..000000000000 --- a/net-misc/vde/vde-2.3.2_p20191011.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -if [[ ${PV} == 9999 ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN" -elif [[ ${PV} = *_p* ]]; then - inherit autotools - MY_PN="vde-2" - COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" - SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" - - S="${WORKDIR}/${MY_PN}-${COMMIT}" -else - MY_P="${PN}2-${PV}" - SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" - S="${WORKDIR}/${MY_P}" -fi - -DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" -HOMEPAGE="https://virtualsquare.org" - -LICENSE="GPL-2" -SLOT="0" -# upstream switched to wolfssl -IUSE="pcap selinux static-libs" - -COMMON_DEPS="pcap? ( net-libs/libpcap )" -DEPEND="${COMMON_DEPS}" -RDEPEND="${COMMON_DEPS} - acct-group/qemu - selinux? ( sec-policy/selinux-vde )" - -# upstream switched to wolfssl -src_prepare() { - default - if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then - eautoreconf - fi -# upstream switched to wolfssl -# has_version ">=dev-libs/openssl-1.1.0" && \ -# eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch" -} - -src_configure() { - filter-flags -O0 -Os -# upstream switched to wolfssl -# $(use_enable ssl cryptcab) \ - econf \ - --disable-python \ - --disable-cryptcab \ - $(use_enable pcap) \ - $(use_enable static-libs static) -} - -src_compile() { - # https://github.com/virtualsquare/vde-2/issues/6 - emake -j1 -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die - - newinitd "${FILESDIR}"/vde.init-r1 vde - newconfd "${FILESDIR}"/vde.conf-r1 vde -} - -pkg_postinst() { - einfo "To start vde automatically add it to the default runlevel:" - einfo "# rc-update add vde default" - einfo "You need to setup tap0 in /etc/conf.d/net" - einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" -} diff --git a/net-misc/vde/vde-2.3.3.ebuild b/net-misc/vde/vde-2.3.3.ebuild new file mode 100644 index 000000000000..4cacbb0f887b --- /dev/null +++ b/net-misc/vde/vde-2.3.3.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/virtualsquare/vde-2" + inherit git-r3 +elif [[ ${PV} == *_p* ]]; then + MY_COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" + SRC_URI="https://github.com/virtualsquare/vde-2/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/vde-2-${COMMIT}" +else + MY_P="${PN}2-${PV}" + SRC_URI="https://github.com/virtualsquare/vde-2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/vde-2-${PV}" +fi + +DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" +HOMEPAGE="https://virtualsquare.org/" + +LICENSE="GPL-2" +SLOT="0" +if [[ ${PV} != 9999 ]] ; then + KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi +IUSE="pcap selinux static-libs" + +DEPEND="pcap? ( net-libs/libpcap )" +RDEPEND=" + ${DEPEND} + acct-group/qemu + selinux? ( sec-policy/selinux-vde ) +" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + filter-flags -O0 -Os + + local myeconfargs=( + # Upstream switched to wolfssl, so no SSL support for now + --disable-cryptcab + $(use_enable pcap) + $(use_enable static-libs static) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + find "${ED}" -name '*.la' -type f -delete || die + + newinitd "${FILESDIR}"/vde.init-r1 vde + newconfd "${FILESDIR}"/vde.conf-r1 vde +} + +pkg_postinst() { + einfo "To start vde automatically, add it to the default runlevel:" + einfo "# rc-update add vde default" + einfo "You need to setup tap0 in ${EROOT}/etc/conf.d/net" + einfo "To use it as an user, be sure to set a group in ${EROOT}/etc/conf.d/vde" +} diff --git a/net-misc/vde/vde-9999.ebuild b/net-misc/vde/vde-9999.ebuild index 32de524f78b9..4cacbb0f887b 100644 --- a/net-misc/vde/vde-9999.ebuild +++ b/net-misc/vde/vde-9999.ebuild @@ -1,78 +1,71 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit flag-o-matic +inherit autotools flag-o-matic if [[ ${PV} == 9999 ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN" -elif [[ ${PV} = *_p* ]]; then - inherit autotools - MY_PN="vde-2" - COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" - SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - - S="${WORKDIR}/${MY_PN}-${COMMIT}" + EGIT_REPO_URI="https://github.com/virtualsquare/vde-2" + inherit git-r3 +elif [[ ${PV} == *_p* ]]; then + MY_COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb" + SRC_URI="https://github.com/virtualsquare/vde-2/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/vde-2-${COMMIT}" else MY_P="${PN}2-${PV}" - SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2" - S="${WORKDIR}/${MY_P}" + SRC_URI="https://github.com/virtualsquare/vde-2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/vde-2-${PV}" fi DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml" -HOMEPAGE="https://virtualsquare.org" +HOMEPAGE="https://virtualsquare.org/" LICENSE="GPL-2" SLOT="0" -# upstream switched to wolfssl +if [[ ${PV} != 9999 ]] ; then + KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi IUSE="pcap selinux static-libs" -COMMON_DEPS="pcap? ( net-libs/libpcap )" -DEPEND="${COMMON_DEPS}" -RDEPEND="${COMMON_DEPS} +DEPEND="pcap? ( net-libs/libpcap )" +RDEPEND=" + ${DEPEND} acct-group/qemu - selinux? ( sec-policy/selinux-vde )" + selinux? ( sec-policy/selinux-vde ) +" -# upstream switched to wolfssl src_prepare() { default - if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then - eautoreconf - fi -# upstream switched to wolfssl -# has_version ">=dev-libs/openssl-1.1.0" && \ -# eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch" + + eautoreconf } src_configure() { filter-flags -O0 -Os -# upstream switched to wolfssl -# $(use_enable ssl cryptcab) \ - econf \ - --disable-python \ - --disable-cryptcab \ - $(use_enable pcap) \ + + local myeconfargs=( + # Upstream switched to wolfssl, so no SSL support for now + --disable-cryptcab + $(use_enable pcap) $(use_enable static-libs static) -} + ) -src_compile() { - # https://github.com/virtualsquare/vde-2/issues/6 - emake -j1 + econf "${myeconfargs[@]}" } src_install() { default - find "${D}" -name '*.la' -type f -delete || die + + find "${ED}" -name '*.la' -type f -delete || die newinitd "${FILESDIR}"/vde.init-r1 vde newconfd "${FILESDIR}"/vde.conf-r1 vde } pkg_postinst() { - einfo "To start vde automatically add it to the default runlevel:" + einfo "To start vde automatically, add it to the default runlevel:" einfo "# rc-update add vde default" - einfo "You need to setup tap0 in /etc/conf.d/net" - einfo "To use it as an user be sure to set a group in /etc/conf.d/vde" + einfo "You need to setup tap0 in ${EROOT}/etc/conf.d/net" + einfo "To use it as an user, be sure to set a group in ${EROOT}/etc/conf.d/vde" } -- cgit v1.2.3