From 912a91e42d1075ae6261fc2687c24e95c5f0a516 Mon Sep 17 00:00:00 2001 From: Laszlo Valko Date: Tue, 1 Aug 2023 04:22:36 +0200 Subject: [PATCH] Purged obsolete packages & eclass. --- app-emulation/libvirt/Manifest | 16 - app-emulation/libvirt/files/README.gentoo-r3 | 58 --- ...6.0.0-fix_paths_in_libvirt-guests_sh.patch | 35 -- .../libvirt-8.2.0-do-not-use-sysconfig.patch | 211 ----------- ...libvirt-8.2.0-fix-paths-for-apparmor.patch | 68 ---- ...son-Stop-detecting-Wl-version-script.patch | 53 --- .../libvirt/files/libvirt-guests.confd | 68 ---- .../libvirt/files/libvirt-guests.init-r4 | 237 ------------ app-emulation/libvirt/files/libvirtd.confd-r5 | 18 - app-emulation/libvirt/files/libvirtd.init-r19 | 33 -- .../libvirt/files/libvirtd.tmpfiles.conf | 1 - app-emulation/libvirt/files/virtlockd.init-r2 | 23 -- app-emulation/libvirt/files/virtlogd.init-r2 | 23 -- app-emulation/libvirt/libvirt-8.9.0-r2.ebuild | 349 ------------------ app-emulation/libvirt/metadata.xml | 100 ----- eclass/nsplugins.eclass | 80 ---- media-gfx/geeqie/Manifest | 5 - .../geeqie/files/geeqie-1.5.1-no_common.patch | 75 ---- media-gfx/geeqie/files/geeqie-1.6-yelp.patch | 25 -- media-gfx/geeqie/geeqie-1.6-r1.ebuild | 95 ----- media-gfx/geeqie/metadata.xml | 15 - net-dialup/freeradius/Manifest | 6 - .../freeradius-3.0.20-systemd-service.patch | 57 --- .../files/freeradius-3.0.25-samba.patch | 160 -------- net-dialup/freeradius/files/radius.conf-r6 | 22 -- net-dialup/freeradius/files/radius.init-r4 | 31 -- .../freeradius/freeradius-3.0.25-r2.ebuild | 274 -------------- www-client/opera/Manifest | 3 - www-client/opera/opera-12.16_p1860-r1.ebuild | 234 ------------ 29 files changed, 2375 deletions(-) delete mode 100644 app-emulation/libvirt/Manifest delete mode 100644 app-emulation/libvirt/files/README.gentoo-r3 delete mode 100644 app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch delete mode 100644 app-emulation/libvirt/files/libvirt-8.2.0-do-not-use-sysconfig.patch delete mode 100644 app-emulation/libvirt/files/libvirt-8.2.0-fix-paths-for-apparmor.patch delete mode 100644 app-emulation/libvirt/files/libvirt-9.2.0-meson-Stop-detecting-Wl-version-script.patch delete mode 100644 app-emulation/libvirt/files/libvirt-guests.confd delete mode 100644 app-emulation/libvirt/files/libvirt-guests.init-r4 delete mode 100644 app-emulation/libvirt/files/libvirtd.confd-r5 delete mode 100644 app-emulation/libvirt/files/libvirtd.init-r19 delete mode 100644 app-emulation/libvirt/files/libvirtd.tmpfiles.conf delete mode 100644 app-emulation/libvirt/files/virtlockd.init-r2 delete mode 100644 app-emulation/libvirt/files/virtlogd.init-r2 delete mode 100644 app-emulation/libvirt/libvirt-8.9.0-r2.ebuild delete mode 100644 app-emulation/libvirt/metadata.xml delete mode 100644 eclass/nsplugins.eclass delete mode 100644 media-gfx/geeqie/Manifest delete mode 100644 media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch delete mode 100644 media-gfx/geeqie/files/geeqie-1.6-yelp.patch delete mode 100644 media-gfx/geeqie/geeqie-1.6-r1.ebuild delete mode 100644 media-gfx/geeqie/metadata.xml delete mode 100644 net-dialup/freeradius/Manifest delete mode 100644 net-dialup/freeradius/files/freeradius-3.0.20-systemd-service.patch delete mode 100644 net-dialup/freeradius/files/freeradius-3.0.25-samba.patch delete mode 100644 net-dialup/freeradius/files/radius.conf-r6 delete mode 100644 net-dialup/freeradius/files/radius.init-r4 delete mode 100644 net-dialup/freeradius/freeradius-3.0.25-r2.ebuild delete mode 100644 www-client/opera/Manifest delete mode 100644 www-client/opera/opera-12.16_p1860-r1.ebuild diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest deleted file mode 100644 index 1e6d5a2..0000000 --- a/app-emulation/libvirt/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -AUX README.gentoo-r3 2065 BLAKE2B f3677b916121126c431ba32e324bcc9f04b4dfeef1ee54517cae1118c67274592d890d6d919a48af6709e9220379797549277904a02fea740a69b1bf8f2397aa SHA512 77ede8a3e1a380b334595e65ae148acd2e52d594200253dc67d68dd256db5bf72ce7ce222d067c739ce53f84634421e74726f30c0ab7a1c76b86ccdc191c8a69 -AUX libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch 1281 BLAKE2B 631f813ad29db29a6eb537ecd7b9d12aed097c5e0e01c07161adac1dec8a6f129bc098172fe6de4e78a2fbe5e67052005a7c5d1d17cbbb63ad27025662b9fa34 SHA512 dc80c9fc459207dd1ff77548054ea5a51c41a2d36e1b8917eca5f69293a86168af3da47466d8ff954a8b2e0ead9f28ed7d6c2c3671cf67d0ebb4039003a0dde2 -AUX libvirt-8.2.0-do-not-use-sysconfig.patch 8420 BLAKE2B 37856003bc58b69531be6b55fcc3304b71558b7a5306c2da3fbad2d5eac006ca3ebb54bd56f8e761363311a5c865d2cd072c418794fcb605562fc32f997c88a9 SHA512 84a693b870aebe0f87f518473d28d97e613b6069f497e6e49c3e8feffc96c2e709d0a7a3530c52d4d034c6b0bc7374ab61f40ddd2f071735c5baacdebcfca8b6 -AUX libvirt-8.2.0-fix-paths-for-apparmor.patch 2785 BLAKE2B 2b1daa96385ce09a078e1c152b222b274fcde1803497de8709d7569debc1537e9ee4f65a1f775636521ba351310ad13806005e1c02fa00224551244a79ace109 SHA512 be537022563bcf782381cdb99188becf1785de950124626e5ea13219a870a1c6c13834f2cb3c9cf4c364a66b5a7647bfa856a4c5e634dfac6a591c8c93e5ce9f -AUX libvirt-9.2.0-meson-Stop-detecting-Wl-version-script.patch 1981 BLAKE2B 69625606757a2b77c9fe4f38b2921ae4f7fb3b929ff7a0a0b9b76b9af5b575264397ae2710398a58fe5af778ab71db3494e4ff597e4cd1595d93b078d002c2f4 SHA512 8e2186f3eecd6bcdf523d4be24a9961251118e4375a5f923009ad1ec83c2c1fd96147ecb540197f780a397d9ff67b35b1f16b5a5180dce1b0aeb7c7c5bfa9485 -AUX libvirt-guests.confd 2430 BLAKE2B 9d56477c9377e02503782e6d653579c6d149b292c43f37926f4646374e8aae05ca812b6a3a561811482861f8fe67dfdbe63851963326ddbbf2f4644c85411120 SHA512 78f419a89de7aabaad860903c24f1c070786fc1296d987e61dd537705b0e7f71a46c315888028f3826c3417e42861ca8471788be4ec5695e98427c5f18ae63fc -AUX libvirt-guests.init-r4 5591 BLAKE2B e745692a7ea706c8367cdb7ee2114565770bda5be5675ba3a541555659d17875f7996ff7028bf415224d095b49b71205a3d77f420464d5579ccc189def5e434d SHA512 ec2bc46d72afa61513983b777e2d49da618a35a4687bc75674b3a49ababd4e2e387661010d342fee86c7a73d259644985a263a6c2976e29a436d88921bb040b0 -AUX libvirtd.confd-r5 740 BLAKE2B 74a069f4902dd1352f06029c886200615a35870ff88496c91956d23a3172db0789086622422f545498e92b7f8de41225022185fe291dd580cbacdeb783163f4b SHA512 98f935589dbc5f2a99329f77fdf84c563fa0dc99404b7476603679478d68ce8dbea2c88645251d3c28f59e7bcae124ae632972146e8a8c3e0e9fcbfb27296f91 -AUX libvirtd.init-r19 1124 BLAKE2B 0effd71cd3dfda0892c37e4d6d69f5d6d02320a3f0793d4cf5490ef74868f0bb00ff8fbfc0ab4be057f56e40284c3f25b5821b1f6a34d0eccb1676a6d299aac8 SHA512 ba9bfe2c71d9c203857b69b7f6a84bea4a45c055e6627af351eec71faaf1ab043594ce35c31d853429f8b865373bdb76484357a492dd6c0e73631943c52c0fc0 -AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47abf4088167484f1f3149a4998840cf1aba745621851d7e2653df5c7f7268d8d61be3a3731ea053a88f35c13b SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed -AUX virtlockd.init-r2 573 BLAKE2B 83bbd228bd59fa29f1d974bc5eec8af0b701328a0a64bbb9e2d9cb918d5d0b3c0d5e791afa18f47ffa2c429082083912fda3f2401c3c5b3d8d85ea8b7cacf440 SHA512 11bf7208e8da8cf7b907049100d095f4d6b5d215a0955fa620e50d6d541d3ecd9d779a7903c64feb25d17545c45491d52441e14a04f2c793f3b03dee7784c482 -AUX virtlogd.init-r2 572 BLAKE2B e6a86e34eda78fc032df17e1bd94095e357770f4036e19fff895266b58df7e31774f6004fec56fad9e69bf7d1afa5d898bdebe018013877f8844d05b3a46d509 SHA512 d5d83edee8a4bdf0dac79abc129ff7ec11573aa580e32963d7c7d47133e276a4427d8653683fc8b0a6c1c2aba631e5875c73454d6fef3bcac6dcaca542e69f34 -DIST libvirt-8.9.0.tar.xz 8946352 BLAKE2B 537b6badb6171110e99561613fb1318144991107139401296248afb747ae6f9cfafcd17b2292b8d8dcc9188ff4206035ea814efa6c129bae50c0518f61be9b81 SHA512 10426d45d55bb18e8e5d4327d698fbc6efd83c5f515ac40a0fcd72048a77936fe0b422ac14bce9966a65379d262df294c314f854a97861a223a0cbc6a8fd2382 -DIST libvirt-8.9.0.tar.xz.asc 833 BLAKE2B a2054d0d9c8301aa0f8697253690b1ddd530a577bc789c7f38dc36a835134d0c8e5fc88536371c75da66afd9808540b9236e8d1247e4d7bd5f3a0aaf35c45f97 SHA512 087d5406ef23d6beee4a37e471d7d0aa433990b892f0beb7be76609fbdfcb69381acd59d63c62dcd2e2f9ccfcdefc35109cc175a0da4263e9b189981cb2baff1 -EBUILD libvirt-8.9.0-r2.ebuild 9136 BLAKE2B 197b18ee1f588691bc0947f7783208adf726b442be95bddb80ed02e541b0d5b4ecec878f7c2a56019ecf55165a19bd7d2e0e0bb2e066887c441dd8ec57ed9eb5 SHA512 df61ed7e908741194f4aabb2eefd0be6c781787fcd0c962fcf34d939d7f72c51a77b7d4799763d86fdba64152e7988191971fc2952c6c1a9e89b7603e8eadfdd -MISC metadata.xml 3729 BLAKE2B 2e68676afb3820c7b8cd3d76b0a5c42886e246fc6b440ce49c71cbe60c124cdccd4ed8fb97f7153529b758d56dfba98b6a98a31b2fbff7e738f52bce796a3476 SHA512 0dfe519af8b740de9d41b1e2c40133026718a782b654a261c54cbe22b5f694cda8b73036c59411317757b73c40acaea77f70d7ab86ae8325e78d61151e6c64f1 diff --git a/app-emulation/libvirt/files/README.gentoo-r3 b/app-emulation/libvirt/files/README.gentoo-r3 deleted file mode 100644 index 0eab21d..0000000 --- a/app-emulation/libvirt/files/README.gentoo-r3 +++ /dev/null @@ -1,58 +0,0 @@ -Important: The openrc libvirtd init script is now broken up into two -separate services: libvirtd, that solely handles the daemon, and -libvirt-guests, that takes care of clients during shutdown/restart of the -host. In order to reenable client handling, edit /etc/conf.d/libvirt-guests -and enable the service and start it: - - $ rc-update add libvirt-guests - $ rc-service libvirt-guests start - - -For the basic networking support (bridged and routed networks) you don't -need any extra software. For more complex network modes including but not -limited to NATed network, you can enable the 'virt-network' USE flag. It -will pull in required runtime dependencies - - -If you are using dnsmasq on your system, you will have to configure -/etc/dnsmasq.conf to enable the following settings: - - bind-interfaces - interface or except-interface - -Otherwise you might have issues with your existing DNS server. - - -For openrc users: - - Please use /etc/conf.d/libvirtd to control the '--listen' parameter for - libvirtd. - - Use /etc/init.d/libvirt-guests to manage clients on restart/shutdown of - the host. The default configuration will suspend and resume running kvm - guests with 'managedsave'. This behavior can be changed under - /etc/conf.d/libvirt-guests - - -For systemd users: - - The '--listen' parameter is unavailable when libvirtd is run as a - systemd unit. - - The configuration for the 'libvirt-guests.service' is found under - /etc/libvirt/libvirt-guests.conf" - - -If you have built libvirt with policykit support, a new group "libvirt" has -been created. Simply add a user to the libvirt group in order to grant -administrative access to libvirtd. Alternatively, drop a custom policykit -rule into /etc/polkit-1/rules.d. - -If you have built libvirt without policykit support (USE=-policykit), you -must change the unix sock group and/or perms in /etc/libvirt/libvirtd.conf -in order to allow normal users to connect to libvirtd. - - -If libvirt is built with USE=caps, libvirt will now start qemu/kvm VMs -with non-root privileges. Ensure any resources your VMs use are accessible -by qemu:qemu. diff --git a/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch b/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch deleted file mode 100644 index bf7a328..0000000 --- a/app-emulation/libvirt/files/libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e97700d867ffa949c97f8a635a76b9ce510e806f Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com> -References: <5965f20fe0275b324c9b84ab7f48dd7db0494495.1580460243.git.mprivozn@redhat.com> -From: Michal Privoznik -Date: Fri, 31 Jan 2020 09:42:14 +0100 -Subject: [PATCH 2/3] Fix paths in libvirt-guests.sh.in - -Signed-off-by: Michal Privoznik ---- - tools/libvirt-guests.sh.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in -index a881f6266e..79d38b3e9a 100644 ---- a/tools/libvirt-guests.sh.in -+++ b/tools/libvirt-guests.sh.in -@@ -39,11 +39,11 @@ START_DELAY=0 - BYPASS_CACHE=0 - SYNC_TIME=0 - --test -f "$sysconfdir"/sysconfig/libvirt-guests && -- . "$sysconfdir"/sysconfig/libvirt-guests -+test -f "$sysconfdir"/libvirt/libvirt-guests.conf && -+ . "$sysconfdir"/libvirt/libvirt-guests.conf - - LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests --VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests -+VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/libvirt-guests - - RETVAL=0 - --- -2.24.1 - diff --git a/app-emulation/libvirt/files/libvirt-8.2.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-8.2.0-do-not-use-sysconfig.patch deleted file mode 100644 index fae6129..0000000 --- a/app-emulation/libvirt/files/libvirt-8.2.0-do-not-use-sysconfig.patch +++ /dev/null @@ -1,211 +0,0 @@ -From 10d65f10a76c7478c4ec0c65ffeec7f4b18929f9 Mon Sep 17 00:00:00 2001 -Message-Id: <10d65f10a76c7478c4ec0c65ffeec7f4b18929f9.1646212419.git.mprivozn@redhat.com> -From: Michal Privoznik -Date: Wed, 2 Mar 2022 10:01:04 +0100 -Subject: [PATCH] libvirt-8.2.0-do-not-use-sysconfig.patch - -Signed-off-by: Michal Privoznik ---- - src/interface/virtinterfaced.service.in | 1 - - src/libxl/virtxend.service.in | 1 - - src/locking/virtlockd.service.in | 1 - - src/logging/virtlogd.service.in | 3 +-- - src/lxc/virtlxcd.service.in | 1 - - src/network/virtnetworkd.service.in | 1 - - src/node_device/virtnodedevd.service.in | 1 - - src/nwfilter/virtnwfilterd.service.in | 1 - - src/qemu/virtqemud.service.in | 1 - - src/remote/libvirtd.service.in | 1 - - src/remote/virtproxyd.service.in | 1 - - src/secret/virtsecretd.service.in | 1 - - src/storage/virtstoraged.service.in | 1 - - src/vbox/virtvboxd.service.in | 1 - - tools/libvirt-guests.service.in | 2 +- - 15 files changed, 2 insertions(+), 16 deletions(-) - -diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtinterfaced.service.in -index cb860ff1c4..090b198ac7 100644 ---- a/src/interface/virtinterfaced.service.in -+++ b/src/interface/virtinterfaced.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTINTERFACED_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced - ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in -index 6b083c414f..597f5d1905 100644 ---- a/src/libxl/virtxend.service.in -+++ b/src/libxl/virtxend.service.in -@@ -19,7 +19,6 @@ ConditionPathExists=/proc/xen/capabilities - [Service] - Type=notify - Environment=VIRTXEND_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtxend - ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in -index 19271d1e7d..87193952cb 100644 ---- a/src/locking/virtlockd.service.in -+++ b/src/locking/virtlockd.service.in -@@ -8,7 +8,6 @@ Documentation=https://libvirt.org - - [Service] - Environment=VIRTLOCKD_ARGS= --EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd - ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS - ExecReload=/bin/kill -USR1 $MAINPID - # Losing the locks is a really bad thing that will -diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in -index 8ab5478517..fe5c58b8ed 100644 ---- a/src/logging/virtlogd.service.in -+++ b/src/logging/virtlogd.service.in -@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd --ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS -+ExecStart=@sbindir@/virtlogd - ExecReload=/bin/kill -USR1 $MAINPID - # Losing the logs is a really bad thing that will - # cause the machine to be fenced (rebooted), so make -diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in -index 334c34db44..1b9689017e 100644 ---- a/src/lxc/virtlxcd.service.in -+++ b/src/lxc/virtlxcd.service.in -@@ -19,7 +19,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTLXCD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd - ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process -diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in -index 05ce672b73..ee4cd9bca1 100644 ---- a/src/network/virtnetworkd.service.in -+++ b/src/network/virtnetworkd.service.in -@@ -17,7 +17,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTNETWORKD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd - ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virtnodedevd.service.in -index cd9de362fd..7693aa52c4 100644 ---- a/src/node_device/virtnodedevd.service.in -+++ b/src/node_device/virtnodedevd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTNODEDEVD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd - ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfilterd.service.in -index ab65419e0c..16d8b377b0 100644 ---- a/src/nwfilter/virtnwfilterd.service.in -+++ b/src/nwfilter/virtnwfilterd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTNWFILTERD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd - ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in -index 5ad968ace9..c63147d31f 100644 ---- a/src/qemu/virtqemud.service.in -+++ b/src/qemu/virtqemud.service.in -@@ -21,7 +21,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTQEMUD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud - ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process -diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in -index 5d4d412fcc..27cfc34b90 100644 ---- a/src/remote/libvirtd.service.in -+++ b/src/remote/libvirtd.service.in -@@ -29,7 +29,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=LIBVIRTD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd - ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - KillMode=process -diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.service.in -index f9bb6b84a9..0eddf5ee93 100644 ---- a/src/remote/virtproxyd.service.in -+++ b/src/remote/virtproxyd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTPROXYD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd - ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.service.in -index 6d298c5334..92e54f175f 100644 ---- a/src/secret/virtsecretd.service.in -+++ b/src/secret/virtsecretd.service.in -@@ -14,7 +14,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTSECRETD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd - ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged.service.in -index eda4d86d37..abe91e3d80 100644 ---- a/src/storage/virtstoraged.service.in -+++ b/src/storage/virtstoraged.service.in -@@ -16,7 +16,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTSTORAGED_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged - ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in -index 6f447276e9..54fbd0be4a 100644 ---- a/src/vbox/virtvboxd.service.in -+++ b/src/vbox/virtvboxd.service.in -@@ -15,7 +15,6 @@ Documentation=https://libvirt.org - [Service] - Type=notify - Environment=VIRTVBOXD_ARGS="--timeout 120" --EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd - ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS - ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure -diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in -index 3cf6476196..5668009ae4 100644 ---- a/tools/libvirt-guests.service.in -+++ b/tools/libvirt-guests.service.in -@@ -20,7 +20,7 @@ Documentation=man:libvirt-guests(8) - Documentation=https://libvirt.org - - [Service] --EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests -+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf - # Hack just call traditional service until we factor - # out the code - ExecStart=@libexecdir@/libvirt-guests.sh start --- -2.34.1 - diff --git a/app-emulation/libvirt/files/libvirt-8.2.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-8.2.0-fix-paths-for-apparmor.patch deleted file mode 100644 index 544eb94..0000000 --- a/app-emulation/libvirt/files/libvirt-8.2.0-fix-paths-for-apparmor.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 52ecc3247d72e2a5ffc390093d803f59e20087f6 Mon Sep 17 00:00:00 2001 -Message-Id: <52ecc3247d72e2a5ffc390093d803f59e20087f6.1647318231.git.mprivozn@redhat.com> -From: Michal Privoznik -Date: Tue, 15 Mar 2022 05:23:29 +0100 -Subject: [PATCH] libvirt-8.2.0-fix-paths-for-apparmor.patch - -Signed-off-by: Michal Privoznik ---- -diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu -index 44056b5f14..1f0db2cda2 100644 ---- a/src/security/apparmor/libvirt-qemu -+++ b/src/security/apparmor/libvirt-qemu -@@ -96,6 +96,7 @@ - /usr/share/sgabios/** r, - /usr/share/slof/** r, - /usr/share/vgabios/** r, -+ /usr/share/seavgabios/** r, - - # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140) - /etc/pki/CA/ r, -diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build -index 58b4024b85..c77b32665d 100644 ---- a/src/security/apparmor/meson.build -+++ b/src/security/apparmor/meson.build -@@ -1,5 +1,5 @@ - apparmor_gen_profiles = [ -- 'usr.lib.libvirt.virt-aa-helper', -+ 'usr.libexec.libvirt.virt-aa-helper', - 'usr.sbin.libvirtd', - 'usr.sbin.virtqemud', - 'usr.sbin.virtxend', -@@ -35,7 +35,7 @@ install_data( - ) - - install_data( -- 'usr.lib.libvirt.virt-aa-helper.local', -+ 'usr.libexec.libvirt.virt-aa-helper.local', - install_dir: apparmor_dir / 'local', -- rename: 'usr.lib.libvirt.virt-aa-helper', -+ rename: 'usr.libexec.libvirt.virt-aa-helper', - ) -diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in -similarity index 94% -rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in -rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in -index ff1d46bebe..6beedde1b1 100644 ---- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in -+++ b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.in -@@ -41,7 +41,7 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { - deny /dev/mapper/* r, - - @libexecdir@/virt-aa-helper mr, -- /{usr/,}sbin/apparmor_parser Ux, -+ /{usr/,}{s,}bin/apparmor_parser Ux, - - @sysconfdir@/apparmor.d/libvirt/* r, - @sysconfdir@/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw, -@@ -71,5 +71,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper { - /**.[iI][sS][oO] r, - /**/disk{,.*} r, - -- #include -+ #include - } -diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local b/src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local -similarity index 100% -rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.local -rename to src/security/apparmor/usr.libexec.libvirt.virt-aa-helper.local diff --git a/app-emulation/libvirt/files/libvirt-9.2.0-meson-Stop-detecting-Wl-version-script.patch b/app-emulation/libvirt/files/libvirt-9.2.0-meson-Stop-detecting-Wl-version-script.patch deleted file mode 100644 index 18b36c9..0000000 --- a/app-emulation/libvirt/files/libvirt-9.2.0-meson-Stop-detecting-Wl-version-script.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 743fdb97c81f38adc6e9b55f402244f7982352f4 Mon Sep 17 00:00:00 2001 -Message-Id: <743fdb97c81f38adc6e9b55f402244f7982352f4.1679396460.git.mprivozn@redhat.com> -From: Michal Privoznik -Date: Mon, 20 Mar 2023 13:38:27 +0100 -Subject: [PATCH] meson: Stop detecting -Wl,--version-script= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With its version 16.0, the LLVM's linker turned on ---no-undefined-version by default [1]. This breaks how we detect ---version-script= detection, because at the compile time there's -no library built yet that we can use to make --version-script= -happy. Unfortunately, meson does not provide a way to detect this -either [2]. - -But there's not much sense in detecting the argument either. We -already special case some systems (windows, darwin) and do the -check for others, which are expected to support versioned -symbols, because of ELF. Worst case scenario - the error is -reported during compile time rather than configure time. - -1: https://reviews.llvm.org/D135402 -2: https://github.com/mesonbuild/meson/issues/3047 - -Resolves: https://bugs.gentoo.org/902211 -Signed-off-by: Michal Privoznik -Reviewed-by: Daniel P. Berrangé ---- - meson.build | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index c35823a79a..a0682e8d0b 100644 ---- a/meson.build -+++ b/meson.build -@@ -534,12 +534,7 @@ elif host_machine.system() == 'darwin' - # macOS libraries don't support symbol versioning - version_script_flags = '' - else -- test_file = '@0@/src/libvirt_qemu.syms'.format(meson.project_source_root()) -- if cc.has_link_argument('-Wl,--version-script=@0@'.format(test_file)) -- version_script_flags = '-Wl,--version-script=' -- else -- error('No supported version script link argument found.') -- endif -+ version_script_flags = '-Wl,--version-script=' - endif - - libvirt_flat_namespace = [] --- -2.39.2 - diff --git a/app-emulation/libvirt/files/libvirt-guests.confd b/app-emulation/libvirt/files/libvirt-guests.confd deleted file mode 100644 index ed2ce58..0000000 --- a/app-emulation/libvirt/files/libvirt-guests.confd +++ /dev/null @@ -1,68 +0,0 @@ -# /etc/conf.d/libvirtd - -# LIBVIRT_URIS -# space separated list of libvirt URIs to communicate with to start/stop guests -# Valid values are anything that can be passed to 'virsh connect' - -#LIBVIRT_URIS="qemu:///system" - - -# LIBVIRT_SHUTDOWN -# Valid options: -# * managedsave - Performs a state save external to the VM (for hypervisors -# supporting this operation). qemu-kvm will stop the CPU -# and save off all state to a separate file. When the -# machine is started again, it will resume like nothing -# ever happened. This is guarenteed to always successfully -# stop your machine and restart it. -# -# * shutdown - Sends an ACPI shutdown (think of this as a request to -# your guest to shutdown). There is no way to distinguish -# between guests that are ignoring the shutdown request or -# are stuck or are taking a long time to shutdown. We will -# wait LIBVIRT_MAXWAIT seconds before yanking the power -# out. -# -# * destroy - Immediately stop all running guests. Use with caution as -# this can leave the guest in a corrupted state and might -# lead to data loss. -# - -#LIBVIRT_SHUTDOWN="managedsave" - - -# LIBVIRT_MAXWAIT -# Timeout in seconds until stopping a guest and "pulling the plug" on the -# guest -# Valid values are any integer over 0 - -#LIBVIRT_MAXWAIT="500" - - -# LIBVIRT_START -# If this value is set to 'no', then guests and networks that were shutdown -# by this script when it was stopped will not be started when it is started -# back up. -# Valid values are yes or no - -#LIBVIRT_START="yes" - - -# LIBVIRT_IGNORE_AUTOSTART -# If the VM is marked for autostart in its XML configuration then we won't -# save its start when the init script is stopped. The result is that when -# the init script starts back up, no attempt will be made to start the VM or -# confirm it is started. -# Valid values are yes or no - -#LIBVIRT_IGNORE_AUTOSTART="no" - - -# LIBVIRT_NET_SHUTDOWN -# If libvirtd created networks for you (e.g. NATed networks) then this init -# script will shut them down for you if this is set to 'yes'. Otherwise, -# the networks will be left running. For this option to be useful you must -# have enabled the 'virt-network' USE flag and have had libvirt create a -# NATed network for you. Valid values: 'yes' or 'no' - -#LIBVIRT_NET_SHUTDOWN="yes" diff --git a/app-emulation/libvirt/files/libvirt-guests.init-r4 b/app-emulation/libvirt/files/libvirt-guests.init-r4 deleted file mode 100644 index b29f04c..0000000 --- a/app-emulation/libvirt/files/libvirt-guests.init-r4 +++ /dev/null @@ -1,237 +0,0 @@ -#!/sbin/openrc-run - -description="Virtual Machine Management (libvirt) Guests" - -depend() { - use libvirtd -} - -# set the default to QEMU -[ -z "${LIBVIRT_URIS}" ] && LIBVIRT_URIS="qemu:///system" - -# default to suspending the VM via managedsave -case "${LIBVIRT_SHUTDOWN}" in - managedsave|shutdown|destroy) ;; - *) LIBVIRT_SHUTDOWN="managedsave" ;; -esac - -# default to 500 seconds -[ -z ${LIBVIRT_MAXWAIT} ] && LIBVIRT_MAXWAIT=500 - -gueststatefile="/var/lib/libvirt/libvirt-guests.state" -netstatefile="/var/lib/libvirt/libvirt-net.state" - -do_virsh() { - local hvuri=$1 - shift - - # if unset, default to qemu - [ -z ${hvuri} ] && hvuri="qemu:///system" - # if only qemu was supplied then correct the value - [ "xqemu" = x${hvuri} ] && hvuri="qemu:///system" - - # Silence errors because virsh always throws an error about - # not finding the hypervisor version when connecting to libvirtd - # lastly strip the blank line at the end - LC_ALL=C virsh -c ${hvuri} "$@" 2>/dev/null | head -n -1 -} - -libvirtd_dom_list() { - # Only work with domains by their UUIDs - local hvuri=$1 - shift - - # The grep is to remove dom0 for xen domains. Otherwise we never hit 0 - do_virsh "${hvuri}" list --uuid $@ | grep -v 00000000-0000-0000-0000-000000000000 -} - -libvirtd_dom_count() { - local hvuri=$1 - shift - - libvirtd_dom_list "${hvuri}" $@ | wc -l -} - -libvirtd_net_list() { - # Only work with networks by their UUIDs - local hvuri=$1 - shift - - do_virsh "${hvuri}" net-list --uuid $@ -} - -libvirtd_net_count() { - local hvuri=$1 - shift - - libvirtd_net_list "${hvuri}" $@ | wc -l -} - -libvirtd_dom_stop() { - # stops all persistent or transient domains for a given URI - # $1 - uri - # $2 - persisent/transient - - local uri=$1 - local persist=$2 - local shutdown_type=${LIBVIRT_SHUTDOWN} - local counter=${LIBVIRT_MAXWAIT} - local dom_name= - local dom_as= - local dom_ids= - local uuid= - local dom_count= - - [ "${persist}" = "--transient" ] && shutdown_type="shutdown" - [ -n "${counter}" ] || counter=500 - - einfo " Shutting down domain(s) ..." - - # grab all persistent or transient domains running - dom_ids=$(libvirtd_dom_list ${uri} ${persist}) - - for uuid in ${dom_ids}; do - # Get the name - dom_name=$(do_virsh ${uri} domname ${uuid}) - einfo " ${dom_name}" - # Get autostart state - dom_as=$(do_virsh ${uri} dominfo ${uuid} | \ - awk '$1 == "Autostart:" { print $2 }') - - if [ "${persist}" = "--persistent" ]; then - # Save our running state only if LIBVIRT_IGNORE_AUTOSTART != yes - if [ "x${LIBVIRT_IGNORE_AUTOSTART}" = "xyes" ] && \ - [ ${dom_as} = "enabled" ]; then - : - else - echo "${uri} ${uuid}" >> ${gueststatefile} - fi - - fi - - # Now let's stop it - do_virsh "${uri}" ${shutdown_type} ${uuid} > /dev/null - - done - - dom_count="$(libvirtd_dom_count ${uri} ${persist})" - while [ ${dom_count} -gt 0 ] && [ ${counter} -gt 0 ] ; do - dom_count="$(libvirtd_dom_count ${uri} ${persist})" - sleep 1 - if [ "${shutdown_type}" = "shutdown" ]; then - counter=$((${counter} - 1)) - fi - printf "." - done - - if [ "${shutdown_type}" = "shutdown" ]; then - # grab all domains still running - dom_ids=$(libvirtd_dom_list ${uri} ${persist}) - for uuid in ${dom_ids}; do - dom_name=$(do_virsh ${uri} domname ${uuid}) - eerror " ${dom_name} forcibly stopped" - do_virsh "${uri}" destroy ${uuid} > /dev/null - done - fi -} - -libvirtd_net_stop() { - # stops all persistent or transient domains for a given URI - # $1 - uri - # $2 - persisent/transient - - local uri=$1 - local persist=$2 - local uuid= - local net_name= - - if [ "${LIBVIRT_NET_SHUTDOWN}" != "no" ]; then - - einfo " Shutting down network(s):" - for uuid in $(libvirtd_net_list ${uri} ${persist}); do - net_name=$(do_virsh ${uri} net-name ${uuid}) - einfo " ${net_name}" - - if [ "${persist}" = "--persistent" ]; then - # Save our running state - echo "${uri} ${uuid}" >> ${netstatefile} - - fi - - # Actually stop the network - do_virsh qemu net-destroy ${uuid} > /dev/null - done - - fi -} - -start() { - local uri= - local uuid= - local name= - - for uri in ${LIBVIRT_URIS}; do - do_virsh "${uri}" connect - if [ $? -ne 0 ]; then - eerror "Failed to connect to '${uri}'. Domains may not start." - fi - done - - [ ! -e "${netstatefile}" ] && touch "${netstatefile}" - [ ! -e "${gueststatefile}" ] && touch "${gueststatefile}" - - # if the user didn't want to start any guests up then respect their wish - [ "x${LIBVIRT_START}" = "xno" ] && return 0 - - # start networks - ebegin "Starting libvirt networks" - while read -r uri uuid - do - # ignore trash - [ -z "${uri}" ] || [ -z "${uuid}" ] && continue - - name=$(do_virsh "${uri}" net-name ${uuid}) - einfo " ${name}" - do_virsh "${uri}" net-start ${uuid} > /dev/null - done <"${netstatefile}" - eend 0 - - # start domains - ebegin "Starting libvirt domains" - while read -r uri uuid - do - # ignore trash - [ -z "${uri}" ] || [ -z "${uuid}" ] && continue - - name=$(do_virsh "${uri}" domname ${uuid}) - einfo " ${name}" - do_virsh "${uri}" start ${uuid} > /dev/null - do_virsh "${uri}" domtime --sync ${uuid} > /dev/null - done <"${gueststatefile}" - eend 0 -} - -stop() { - local counter= - local dom_name= - local net_name= - local dom_ids= - local uuid= - local dom_count= - - rm -f "${gueststatefile}" - [ $? -ne 0 ] && eerror "Unable to save domain state" - rm -f "${netstatefile}" - [ $? -ne 0 ] && eerror "Unable to save net state" - - for uri in ${LIBVIRT_URIS}; do - einfo "Stopping libvirt domains and networks for ${uri}" - - libvirtd_dom_stop "${uri}" "--persistent" - libvirtd_dom_stop "${uri}" "--transient" - libvirtd_net_stop "${uri}" "--persistent" - libvirtd_net_stop "${uri}" "--transient" - - einfo "Done stopping domains and networks for ${uri}" - done -} diff --git a/app-emulation/libvirt/files/libvirtd.confd-r5 b/app-emulation/libvirt/files/libvirtd.confd-r5 deleted file mode 100644 index c326531..0000000 --- a/app-emulation/libvirt/files/libvirtd.confd-r5 +++ /dev/null @@ -1,18 +0,0 @@ -# /etc/conf.d/libvirtd - -# Startup dependency -# libvirtd typically requires all networks to be up and settled which -# is what rc_need="net" provides. However if you only use specific networks -# for libvirtd, you may override this. Or if you only use libvirtd locally. -rc_need="net" - -# The termination timeout (start-stop-daemon parameter "retry") ensures -# that the service will be terminated within a given time (25 + 5 seconds -# per default) when you are stopping the service. -#LIBVIRTD_TERMTIMEOUT="TERM/25/KILL/5" - -# LIBVIRTD_OPTS -# You may want to add '--listen' to have libvirtd listen for tcp/ip connections -# if you want to use libvirt for remote control -# Please consult 'libvirtd --help' for more options -#LIBVIRTD_OPTS="--listen" diff --git a/app-emulation/libvirt/files/libvirtd.init-r19 b/app-emulation/libvirt/files/libvirtd.init-r19 deleted file mode 100644 index bbfe676..0000000 --- a/app-emulation/libvirt/files/libvirtd.init-r19 +++ /dev/null @@ -1,33 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="Virtual Machine Management daemon (libvirt)" - -LIBVIRTD_OPTS=${LIBVIRTD_OPTS:-"${LIBVIRTD_OPTS}"} -LIBVIRTD_TIMEOUT=${LIBVIRTD_TERMTIMEOUT:-"TERM/25/KILL/5"} - -command="/usr/sbin/libvirtd" -command_args="${LIBVIRTD_OPTS}" -start_stop_daemon_args="-b --env KRB5_KTNAME=/etc/libvirt/krb5.tab" -pidfile="/run/libvirtd.pid" -retry="${LIBVIRTD_TERMTIMEOUT}" - -depend() { - need virtlogd - use ceph dbus iscsid virtlockd - after cgconfig corosync ebtables iptables ip6tables shorewall nfs nfsmount ntp-client ntpdportmap rpc.statd sanlock xenconsoled - USE_FLAG_FIREWALLD -} - -start_pre() { - # Test configuration directories in /etc/libvirt/ to be either not - # present or a directory, i.e. not a regular file, bug #532892 - - checkpath --directory /etc/libvirt/lxc || return 1 - checkpath --directory /etc/libvirt/nwfilter || return 1 - [ -L /etc/libvirt/qemu ] || - checkpath --directory /etc/libvirt/qemu || return 1 - [ -L /etc/libvirt/storage ] || - checkpath --directory /etc/libvirt/storage || return 1 -} diff --git a/app-emulation/libvirt/files/libvirtd.tmpfiles.conf b/app-emulation/libvirt/files/libvirtd.tmpfiles.conf deleted file mode 100644 index c22c23d..0000000 --- a/app-emulation/libvirt/files/libvirtd.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/libvirt/lxc 0755 root root - diff --git a/app-emulation/libvirt/files/virtlockd.init-r2 b/app-emulation/libvirt/files/virtlockd.init-r2 deleted file mode 100644 index 385dc1e..0000000 --- a/app-emulation/libvirt/files/virtlockd.init-r2 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="libvirt virtual machine lock manager" -command="/usr/sbin/virtlockd" -start_stop_daemon_args="-b" -pidfile="/run/virtlockd.pid" - -extra_started_commands="reload" -description_reload="re-exec the daemon, while maintaining locks and clients" - - -depend() { - after ntp-client ntpd nfs nfsmount corosync -} - -reload() { - ebegin "re-exec() virtlockd" - - start-stop-daemon --signal SIGUSR1 \ - --exec "${command}" --pidfile "${pidfile}" -} diff --git a/app-emulation/libvirt/files/virtlogd.init-r2 b/app-emulation/libvirt/files/virtlogd.init-r2 deleted file mode 100644 index 442dcb8..0000000 --- a/app-emulation/libvirt/files/virtlogd.init-r2 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="libvirt virtual machine logging manager" -command="/usr/sbin/virtlogd" -start_stop_daemon_args="-b" -pidfile="/run/virtlogd.pid" - -extra_started_commands="reload" -description_reload="re-exec the daemon, while maintaining open connections" - - -depend() { - after ntp-client ntpd nfs nfsmount corosync -} - -reload() { - ebegin "re-exec() virtlogd" - - start-stop-daemon --signal SIGUSR1 \ - --exec "${command}" --pidfile "${pidfile}" -} diff --git a/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild b/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild deleted file mode 100644 index c921af5..0000000 --- a/app-emulation/libvirt/libvirt-8.9.0-r2.ebuild +++ /dev/null @@ -1,349 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Packages which get releases together: -# app-emacs/nxml-libvirt-schemas -# dev-python/libvirt-python -# dev-perl/Sys-Virt -# app-emulation/libvirt -# Please bump them together! - -PYTHON_COMPAT=( python3_{9..11} ) -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc -inherit meson linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" - EGIT_BRANCH="master" -else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz - verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )" - KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/" -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -IUSE=" - apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs - iscsi iscsi-direct +libvirtd lvm libssh libssh2 lxc nfs nls numa openvz - parted pcap policykit +qemu rbd sasl selinux +udev - virtualbox +virt-network wireshark-plugins xen zfs -" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - qemu? ( libvirtd ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -BDEPEND=" - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - dev-python/docutils - virtual/pkgconfig - net-libs/rpcsvc-proto - bash-completion? ( >=app-shells/bash-completion-2.0 ) - verify-sig? ( sec-keys/openpgp-keys-libvirt )" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent. -RDEPEND=" - acct-user/qemu - app-misc/scrub - >=dev-libs/glib-2.56.0 - dev-libs/libgcrypt - dev-libs/libnl:3 - >=dev-libs/libxml2-2.9.1 - >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-3.2.0:= - net-libs/libtirpc:= - >=net-misc/curl-7.18.0 - sys-apps/dbus - sys-apps/dmidecode - sys-devel/gettext - >=sys-libs/readline-7.0:= - virtual/acl - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dtrace? ( dev-util/systemtap ) - firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( >=sys-block/open-iscsi-1.18.0 ) - iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( >=net-libs/libssh-0.8.1:= ) - libssh2? ( >=net-libs/libssh2-1.3 ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) - lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[lvm] - ) - pcap? ( >=net-libs/libpcap-1.8.0 ) - policykit? ( - acct-group/libvirt - >=sys-auth/polkit-0.9 - ) - qemu? ( - >=app-emulation/qemu-4.2 - >=dev-libs/yajl-2.0.3:= - ) - rbd? ( sys-cluster/ceph ) - sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[dhcp,ipv6(+),script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6(+)] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) - xen? ( - >=app-emulation/xen-4.9.0 - app-emulation/xen-tools:= - ) - udev? ( - virtual/libudev:= - >=x11-libs/libpciaccess-0.10.9 - ) - zfs? ( sys-fs/zfs ) - kernel_linux? ( sys-apps/util-linux )" -DEPEND=" - ${BDEPEND} - ${RDEPEND} - ${PYTHON_DEPS} -" -# The 'circular' dependency on dev-python/libvirt-python is because of -# virt-qemu-qmp-proxy. -PDEPEND=" - qemu? ( dev-python/libvirt-python ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch - "${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch - "${FILESDIR}"/${PN}-9.2.0-meson-Stop-detecting-Wl-version-script.patch -) - -pkg_setup() { - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM - ~IP_NF_FILTER - ~IP_NF_MANGLE - ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE - ~IP6_NF_FILTER - ~IP6_NF_MANGLE - ~IP6_NF_NAT" - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~IP_NF_TARGET_REJECT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi - - python-any-r1_pkg_setup -} - -src_prepare() { - touch "${S}/.mailmap" || die - - default - python_fix_shebang . - - # Skip fragile tests which relies on pristine environment - # (Breaks because of sandbox environment variables) - # bug #802876 - sed -i -e "/commandtest/d" tests/meson.build || die - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" -} - -src_configure() { - local emesonargs=( - $(meson_feature apparmor) - $(meson_feature apparmor apparmor_profiles) - $(meson_feature audit) - $(meson_feature caps capng) - $(meson_feature dtrace) - $(meson_feature firewalld) - $(meson_feature fuse) - $(meson_feature glusterfs) - $(meson_feature glusterfs storage_gluster) - $(meson_feature iscsi storage_iscsi) - $(meson_feature iscsi-direct storage_iscsi_direct) - $(meson_feature libvirtd driver_libvirtd) - $(meson_feature libssh) - $(meson_feature libssh2) - $(meson_feature lvm storage_lvm) - $(meson_feature lvm storage_mpath) - $(meson_feature lxc driver_lxc) - $(meson_feature nls) - $(meson_feature numa numactl) - $(meson_feature numa numad) - $(meson_feature openvz driver_openvz) - $(meson_feature parted storage_disk) - $(meson_feature pcap libpcap) - $(meson_feature policykit polkit) - $(meson_feature qemu driver_qemu) - $(meson_feature qemu yajl) - $(meson_feature rbd storage_rbd) - $(meson_feature sasl) - $(meson_feature selinux) - $(meson_feature udev) - $(meson_feature virt-network driver_network) - $(meson_feature virtualbox driver_vbox) - $(meson_feature wireshark-plugins wireshark_dissector) - $(meson_feature xen driver_libxl) - $(meson_feature zfs storage_zfs) - - -Dnetcf=disabled - -Dsanlock=disabled - -Dopenwsman=disabled - - -Ddriver_esx=enabled - -Dinit_script=systemd - -Dqemu_user=$(usex caps qemu root) - -Dqemu_group=$(usex caps qemu root) - -Ddriver_remote=enabled - -Dstorage_fs=enabled - -Ddriver_vmware=enabled - - --localstatedir="${EPREFIX}/var" - -Drunstatedir="${EPREFIX}/run" - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - ) - - meson_src_configure -} - -src_test() { - export VIR_TEST_DEBUG=1 - # Don't run the syntax check tests, they're fragile and not relevant - # to us downstream anyway. - # We also crank up the timeout (as Fedora does) just to preempt failures - # on slower arches. - meson_src_test --no-suite syntax-check --timeout-multiplier 10 -} - -src_install() { - meson_src_install - - # Depending on configuration option, libvirt will create some bogus - # directoreis. They are either not used, or libvirtd is able to create - # them on demand, so let's remove them. - # - # Note, we are using -f here so that rm does not fail or warn if the - # directory is nonexistent. - rm -rf "${D}"/etc/sysconfig - rm -rf "${D}"/var - rm -rf "${D}"/run - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - tmpfiles_process libvirtd.conf - readme.gentoo_print_elog -} diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml deleted file mode 100644 index 9784c19..0000000 --- a/app-emulation/libvirt/metadata.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - tamiko@gentoo.org - Matthias Maier - - - michal.privoznik@gmail.com - Michal Prívozník - - - virtualization@gentoo.org - Gentoo Virtualization Project - - - - - Allow using libiscsi for iSCSI storage pool backend - - - Allow using an iSCSI remote storage server as pool for disk image storage - - - Allow using the Logical Volume Manager (sys-fs/lvm2) as pool for disk image - storage - - - Allow using Network File System mounts as pool for disk image storage - - - Allow using real disk partitions as pool for disk image storage, using - sys-block/parted to create, resize and delete them. - - - Enable rados block device support via sys-cluster/ceph - - - - Support management of Linux Containers virtualisation (app-containers/lxc) - - - Support management of OpenVZ virtualisation (openvz-sources) - - - Support management of QEMU virtualisation (app-emulation/qemu) - - - Support management of Xen virtualisation (app-emulation/xen) - - - Support management of VirtualBox virtualisation (app-emulation/virtualbox) - - - Enable dtrace support via dev-util/systemtap - Allow LXC to use sys-fs/fuse for mountpoints - - Use NUMA for memory segmenting via sys-process/numactl and - sys-process/numad - - - Builds the libvirtd daemon as well as the client utilities instead of just the client - utilities - - - Use net-libs/libssh to communicate with remote libvirtd hosts, - for example: qemu+libssh://server/system - - - Use net-libs/libssh2 to communicate with remote libvirtd hosts, - for example: qemu+libssh2://server/system - - - Support auto learning IP addreses for routing - - - Enable virtual networking (NAT) support for guests. Includes all - the dependencies for NATed network mode. Effectively any network - setup that relies on libvirt to setup and configure network - interfaces on your host. This can include bridged and routed - networks ONLY if you are allowing libvirt to create and manage - the underlying devices for you. In some cases this requires - enabling the 'netcf' USE flag (currently unavailable). - - DBus interface to iptables/ebtables allowing - for better runtime management of your firewall. - - Build the net-analyzer/wireshark plugin for the Libvirt RPC protocol - - - Enable GlusterFS support via sys-cluster/glusterfs - - - Enable ZFS backend storage sys-fs/zfs - - - - libvirt/libvirt - - diff --git a/eclass/nsplugins.eclass b/eclass/nsplugins.eclass deleted file mode 100644 index b4dd39e..0000000 --- a/eclass/nsplugins.eclass +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# -# @DEAD -# @ECLASS: nsplugins.eclass -# @MAINTAINER: -# Mozilla Team -# @AUTHOR: -# Original Author: Martin Schlemmer -# @BLURB: reusable functions for netscape/moz plugin sharing -# @DESCRIPTION: -# Reusable functions that promote sharing of netscape/moz plugins, also provides -# share_plugins_dir function for mozilla applications. - -inherit eutils multilib versionator mozextension - -PLUGINS_DIR="nsbrowser/plugins" - -# This function move the plugin dir in src_install() to -# ${D}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be -# the full path (without $D) to old plugin dir. -src_mv_plugins() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" - - # Move plugins dir. We use keepdir so that it might not be unmerged - # by mistake ... - keepdir /usr/$(get_libdir)/${PLUGINS_DIR} - cp -a "${ED}"/$1/* "${ED}"/usr/$(get_libdir)/${PLUGINS_DIR} - rm -rf "${ED}"/$1 - dosym /usr/$(get_libdir)/${PLUGINS_DIR} $1 -} - -# This function move plugins in pkg_preinst() in old dir to -# ${ROOT}/usr/$(get_libdir)/${PLUGIN_DIR}. First argument should be -# the full path (without $ROOT) to old plugin dir. -pkg_mv_plugins() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${ROOT}" - - # Move old plugins dir - if [ -d "${ROOT}/$1" -a ! -L "${ROOT}/$1" ] - then - mkdir -p "${EROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} - cp -a "${EROOT}"/$1/* "${EROOT}"/usr/$(get_libdir)/${PLUGINS_DIR} - rm -rf "${EROOT}"/$1 - fi -} - -# This function installs a plugin with dosym to PLUGINS_DIR. -# First argument should be the plugin file. -inst_plugin() { - if [[ -z "${1}" ]]; then - eerror "The plugin file \"${1}\" does not exist." - die "No such file or directory." - fi - - dodir /usr/$(get_libdir)/${PLUGINS_DIR} - dosym ${1} /usr/$(get_libdir)/${PLUGINS_DIR}/$(basename ${1}) -} - -# This function ensures we use proper plugin path for Gentoo. -# This should only be used by mozilla packages. -# ${MOZILLA_FIVE_HOME} must be defined in src_install to support -share_plugins_dir() { - if [[ ${PN} == seamonkey ]] ; then - rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins \ - || die "failed to remove existing plugins dir" - fi - - if [[ ${PN} == *-bin ]] ; then - PLUGIN_BASE_PATH="/usr/$(get_libdir)" - else - PLUGIN_BASE_PATH=".." - fi - - if $(mozversion_extension_location) ; then - dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/browser/plugins" - else - dosym "${PLUGIN_BASE_PATH}/nsbrowser/plugins" "${MOZILLA_FIVE_HOME}/plugins" - fi -} diff --git a/media-gfx/geeqie/Manifest b/media-gfx/geeqie/Manifest deleted file mode 100644 index ed34d03..0000000 --- a/media-gfx/geeqie/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX geeqie-1.5.1-no_common.patch 2168 BLAKE2B 3949807b4bdd99a9283ca1ff1108fbfcc6cc034d56339875bf1d65513461ccd2da447c4923e5c1c0c14af8f204503c8b2fa72bce4faa4e270a8309cae2fd75e1 SHA512 3198780bc3840691cf2239fdf8d963bb9ead90b38fdf32d4276bd55c70fbb69d0e88f55ed901990c50907dde5b242e0f1af96ca6733ccb767b9e5e2d82ffeda9 -AUX geeqie-1.6-yelp.patch 1044 BLAKE2B be5523c05bf0bc9a416b843a3fea8f5722272e138540ac7e1f4cdbafcf585c1357d07877c14a3dea2209f0206114b45aa4c45410e471bf5604df1be4b8553570 SHA512 fd5d11655ff788d7fb138db8f9cdce3dc9111888e0c2e37b31f9e07c956ab21f9952fd31deccb514a258426382c8c0a0de716e4cde254f4f0f4349793c119445 -DIST geeqie-1.6.tar.xz 1693488 BLAKE2B ee5369884c4c0e60fe827d43ef336c5aaa89d55aec8905bb8cdd4edb2ee12e15d525577a3c85403e2e8955a08c817007b72d1d1e3614063377a21aaba317acee SHA512 4acd05c6012c80581e9c594c7dc7d12265528aa8d3868afef9def36798945afb851da9376bbe5f205ac3c5e1e2362188cc0e2891b49f3ea4396bbc6974c143ef -EBUILD geeqie-1.6-r1.ebuild 2137 BLAKE2B a142435d2859b0dfcaf54521740326e54fb18ed546d71028c954ebe3f90e6172176391c97ff7b7b903f6dd62e6cb48b0c0b49e263e633582ff4b0a62ab11c426 SHA512 ac19e13acbc28c089ff95b2d74609698c2782aad53e2368f8dc5b0d50300fa14794ded3075ee473984a3cf811f9ef35e6894904b8527adf5cf7cf4780bcd7a1f -MISC metadata.xml 924 BLAKE2B 9bafd79f0d60d1237da4b35aeb2142384c188b503c151f8e0a26cd6ea9a2658876c66fb6f248af34eb33f6d2218bafeb1f34521d23c55e244c7ee1b4c0234dda SHA512 73f82d929d6479d81dde14c922ac048feaccf4bf5ea8ffe8aea56cf7cbe0cc8f76c528f3363bbbad3e881640608265a2e583d8b675fce3aa43ad7646023167fc diff --git a/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch b/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch deleted file mode 100644 index 058e226..0000000 --- a/media-gfx/geeqie/files/geeqie-1.5.1-no_common.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 543ea6d903a50c353d9e129d380240f277a670aa Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Thu, 23 Jan 2020 08:24:52 +0000 -Subject: [PATCH] src/options: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` - CXXLD geeqie -ld: ui_fileops.o:(.bss+0x0): - multiple definition of `options'; ui_bookmark.o:(.bss+0x0): first defined here -ld: ui_fileops.o:(.bss+0x8): - multiple definition of `command_line'; ui_bookmark.o:(.bss+0x8): first defined here -``` - -gcc-10 will change the default from -fcommon to fno-common: -https://gcc.gnu.org/PR85678. - -The error also happens if CFLAGS=-fno-common passed explicitly. - -Reported-by: Anthony Parsons -Bug: https://bugs.gentoo.org/706132 -Signed-off-by: Sergei Trofimovich ---- - src/bar_exif.h | 3 --- - src/options.c | 3 +++ - src/options.h | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/bar_exif.h b/src/bar_exif.h -index 63c30d4b..1395e842 100644 ---- a/src/bar_exif.h -+++ b/src/bar_exif.h -@@ -28,9 +28,6 @@ void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_n - void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values); - - /* these are exposed for when duplication of the exif bar's text is needed */ -- --const gchar **bar_exif_key_list; --const gint bar_exif_key_count; - GList *bar_pane_exif_list(); - - #endif -diff --git a/src/options.c b/src/options.c -index 99459381..bab26acb 100644 ---- a/src/options.c -+++ b/src/options.c -@@ -32,6 +32,9 @@ - #include "ui_fileops.h" - #include "window.h" - -+ConfOptions *options; -+CommandLine *command_line; -+ - ConfOptions *init_options(ConfOptions *options) - { - gint i; -diff --git a/src/options.h b/src/options.h -index fcfe961a..02ff8fac 100644 ---- a/src/options.h -+++ b/src/options.h -@@ -329,8 +329,8 @@ struct _ConfOptions - GList *disabled_plugins; - }; - --ConfOptions *options; --CommandLine *command_line; -+extern ConfOptions *options; -+extern CommandLine *command_line; - - ConfOptions *init_options(ConfOptions *options); - void setup_default_options(ConfOptions *options); --- -2.25.0 - diff --git a/media-gfx/geeqie/files/geeqie-1.6-yelp.patch b/media-gfx/geeqie/files/geeqie-1.6-yelp.patch deleted file mode 100644 index e1d7797..0000000 --- a/media-gfx/geeqie/files/geeqie-1.6-yelp.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a33d8c40e9e56597f68e83be3336036992996738 Mon Sep 17 00:00:00 2001 -From: Matthew Miller -Date: Thu, 8 Apr 2021 20:21:39 -0400 -Subject: [PATCH] Fix doc building with newer yelp - -This adds `-i`, because otherwise it will complain about missing files (which -we copy into place later), and adds a trailing slash to the output directory, -because `yelp-build` now puts the files into the wrong place otherwise. ---- - doc/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 3d044bd8..78b96233 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -7,7 +7,7 @@ EXTRA_DIST = docbook2html.sh docbook icons - html/GuideIndex.html: docbook/GuideIndex.xml - rm -rf html; mkdir html; cp $(srcdir)/icons/* html/ - if [ -x "$(GNOME_DOC_TOOL)" ]; then \ -- "$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \ -+ "$(GNOME_DOC_TOOL)" html -i -o html/ $(srcdir)/docbook/GuideIndex.xml ; \ - else \ - echo "yelp-tools not found, html is not built" ; \ - fi diff --git a/media-gfx/geeqie/geeqie-1.6-r1.ebuild b/media-gfx/geeqie/geeqie-1.6-r1.ebuild deleted file mode 100644 index 0ba4fe3..0000000 --- a/media-gfx/geeqie/geeqie-1.6-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -LUA_COMPAT=( lua5-{1..3} ) - -inherit autotools lua-single xdg - -DESCRIPTION="A lightweight GTK image viewer forked from GQview" -HOMEPAGE="http://www.geeqie.org" -SRC_URI="http://www.geeqie.org/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="debug doc exif ffmpegthumbnailer jpeg lcms lirc lua nls pdf tiff xmp" - -RDEPEND=" - virtual/libintl - x11-libs/gtk+:2 - doc? ( app-text/gnome-doc-utils ) - ffmpegthumbnailer? ( media-video/ffmpegthumbnailer ) - jpeg? ( virtual/jpeg:0 ) - lcms? ( media-libs/lcms:2 ) - lirc? ( app-misc/lirc ) - lua? ( ${LUA_DEPS} ) - pdf? ( >=app-text/poppler-0.62[cairo] ) - tiff? ( media-libs/tiff:0 ) - xmp? ( >=media-gfx/exiv2-0.17:=[xmp] ) - !xmp? ( exif? ( >=media-gfx/exiv2-0.17:= ) )" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -PATCHES=( "${FILESDIR}"/${P}-yelp.patch ) - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - default - - # Remove -Werror (gcc changes may add new warnings) - sed -e '/CFLAGS/s/-Werror //g' -i configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-readmedir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable debug debug-log) - $(use_enable ffmpegthumbnailer) - --disable-gpu-accel - --disable-gtk3 - $(use_enable jpeg) - $(use_enable lcms) - $(use_enable lua) - $(use_enable lirc) - --disable-map - $(use_enable nls) - $(use_enable pdf) - $(use_enable tiff) - ) - - if use exif || use xmp; then - myeconfargs+=( --enable-exiv2 ) - else - myeconfargs+=( --disable-exiv2) - fi - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - rm -f "${D}/usr/share/doc/${PF}/COPYING" - # Application needs access to the uncompressed file - docompress -x /usr/share/doc/${PF}/README.md -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Some plugins may require additional packages" - elog "- Image rotate plugin: media-gfx/fbida (JPEG), media-gfx/imagemagick (TIFF/PNG)" - elog "- RAW images plugin: media-gfx/ufraw" -} diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml deleted file mode 100644 index 6bc08d2..0000000 --- a/media-gfx/geeqie/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - voyageur@gentoo.org - Bernard Cafarelli - - Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool - - Enable video thumbnail support with media-video/ffmpegthumbnailer - Enable GPU acceleration support - experimental - Link against x11-libs/gtk+:3 instead of x11-libs/gtk+:2 - Enable items map display - experimental - - diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest deleted file mode 100644 index d3e64fd..0000000 --- a/net-dialup/freeradius/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX freeradius-3.0.20-systemd-service.patch 2162 BLAKE2B 3aa32e5a15efa223aab7880b0cb651edca6695a3727b4df7692f656d1f34366a2a16c364c2a5b544a0ad04bca795be269d4d7dc37bc4c3c6d28387bc3e411ad8 SHA512 8a9f5ecaf559132932ed2e46151ff41e5570df3e844f33ee49004ace0aa7b458a6000ec0d1ed01c34b6236c3dde2ca72cb1031b4badcfa4d6826dbf16ca28259 -AUX freeradius-3.0.25-samba.patch 5797 BLAKE2B 94d15420062288e38757a31386ffea9b2284da2276f4c3bafd0e0f247de7a9bc5d0ea0a3e8c15ae59ad79b20dd2e46dcb4f1aac643d09d63953ba40c16636bef SHA512 af0d2aa54c3bbafaf4bef226842be611f024afc54659cec3c8e8c54c140bd50b9380d63cdeec8d79f04e9f8be6467bd83d12516c6db12a4fc57a8c1f3d61a586 -AUX radius.conf-r6 599 BLAKE2B 35c97ec8a31577afc89bc4f6d7a1310624bea46c2a12ea3cc010fda237b47d5a543225f54d7d4a8b00c1e15f904b149414c597525dd8b6425f20785ca636798d SHA512 acc9b0b178096e44ebfb84228caab1c82bf2f7bb38be386755169bbfb628165b6ac57194ed5a35e566dd0a2d8425f6790b43228a715e633ae8f59e2ab2b574da -AUX radius.init-r4 753 BLAKE2B 18c83f704ac30d14d56ce8a2f5e3176dcd1aab83cc4525b728e3080e81470a9b4124af49459c69070d9c3ed67a95c7593b6d01f0259403fa9ceee43abd541f7c SHA512 8b05604a72a6a0dea3e654f36b13e1ed517d0c277d128475bcca768204d720b3cd9730e5776371818b8deb0f9fd099458bf5a3276ea9b61e3dbacafaaa527892 -DIST freeradius-3.0.25.tar.gz 5300245 BLAKE2B bf8908aa7bfabb9e15fa841457f176a4f2697bdec7994485516ef338908b46f2168260b7acf1a7120a687e543f0381bb787567bb4d564b9d14a3eb464a0e9ed6 SHA512 13382a53e6a1a4495c6f53e662ce21b80d73b6134a72f099f05495b64c56ae1a6c1cd1281311f1c3695d8532207fe5bd3d2026ed2c45f3cb5adb1011f1505ee7 -EBUILD freeradius-3.0.25-r2.ebuild 7629 BLAKE2B 260b149595e05a7ad98a7ca23ddb4fdea04c4953b7a8574489f7fcfd69491ba995b62f90ab3b2dcac8d85c2929bdc726e9195cda2f6128136b611800b66da569 SHA512 64fea6285c702a0b72b3912594a89c142c08d55f5f5d20e7673e09d394e0fef6f64f4314acbb41e558144df73add29a2d89c1d309d01518003fde66f8d3ceccc diff --git a/net-dialup/freeradius/files/freeradius-3.0.20-systemd-service.patch b/net-dialup/freeradius/files/freeradius-3.0.20-systemd-service.patch deleted file mode 100644 index 0422365..0000000 --- a/net-dialup/freeradius/files/freeradius-3.0.20-systemd-service.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/debian/freeradius.service b/debian/freeradius.service -index 378702d184..ee33c2a294 100644 ---- a/debian/freeradius.service -+++ b/debian/freeradius.service -@@ -7,7 +7,6 @@ Documentation=man:radiusd(8) man:radiusd.conf(5) http://wiki.freeradius.org/ htt - Type=notify - WatchdogSec=60 - NotifyAccess=all --EnvironmentFile=-/etc/default/freeradius - - # FreeRADIUS can do static evaluation of policy language rules based - # on environmental variables which is very useful for doing per-host -@@ -25,16 +24,15 @@ MemoryLimit=2G - # Ensure the daemon can still write its pidfile after it drops - # privileges. Combination of options that work on a variety of - # systems. Test very carefully if you alter these lines. --RuntimeDirectory=freeradius -+RuntimeDirectory=radiusd - RuntimeDirectoryMode=0775 - # This does not work on Debian Jessie: --User=freerad --Group=freerad --# This does not work on Ubuntu Bionic: --ExecStartPre=/bin/chown freerad:freerad /var/run/freeradius -+User=radius -+Group=radius - --ExecStartPre=/usr/sbin/freeradius $FREERADIUS_OPTIONS -Cx -lstdout --ExecStart=/usr/sbin/freeradius -f $FREERADIUS_OPTIONS -+ExecStartPre=/usr/sbin/radiusd $RADIUSD_OPTIONS -Cx -lstdout -+ExecStart=/usr/sbin/radiusd -f $RADIUSD_OPTIONS -+ExecReload=/bin/kill -HUP $MAINPID - Restart=on-failure - RestartSec=5 - -@@ -42,7 +40,7 @@ RestartSec=5 - NoNewPrivileges=true - - # Allow binding to secure ports, broadcast addresses, and raw interfaces. --#CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_CHOWN CAP_DAC_OVERRIDE -+CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_CHOWN CAP_DAC_OVERRIDE - - # Private /tmp that isn't shared by other processes - PrivateTmp=true -@@ -60,10 +58,10 @@ ProtectKernelTunables=true - SystemCallArchitectures=native - - # We shouldn't be writing to the configuration directory --ReadOnlyDirectories=/etc/freeradius/ -+ReadOnlyDirectories=/etc/raddb/ - - # We can read and write to the log directory. --ReadWriteDirectories=/var/log/freeradius/ -+ReadWriteDirectories=/var/log/radius/ - - [Install] - WantedBy=multi-user.target diff --git a/net-dialup/freeradius/files/freeradius-3.0.25-samba.patch b/net-dialup/freeradius/files/freeradius-3.0.25-samba.patch deleted file mode 100644 index 779b5c1..0000000 --- a/net-dialup/freeradius/files/freeradius-3.0.25-samba.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- a/src/modules/rlm_mschap/configure.ac 2021-10-07 21:46:04.000000000 +0200 -+++ b/src/modules/rlm_mschap/configure.ac 2022-09-24 05:22:47.398688867 +0200 -@@ -15,13 +15,14 @@ - dnl ############################################################ - - dnl extra argument: --with-winbind-include-dir=DIR -+ winbind_omit= - winbind_include_dir= - AC_ARG_WITH(winbind-include-dir, - [AS_HELP_STRING([--with-winbind-include-dir=DIR], - [Directory where the winbind includes may be found])], - [case "$withval" in - no) -- AC_MSG_ERROR(Need winbind-include-dir) -+ winbind_omit="yes" - ;; - yes) - ;; -@@ -37,7 +38,7 @@ - [Directory where the winbind libraries may be found])], - [case "$withval" in - no) -- AC_MSG_ERROR(Need winbind-lib-dir) -+ winbind_omit="yes" - ;; - yes) - ;; -@@ -52,7 +53,7 @@ - [Base directory where winbind is installed])], - [case "$withval" in - no) -- AC_MSG_ERROR(Need winbind-dir) -+ winbind_omit="yes" - ;; - yes) - ;; -@@ -67,44 +68,48 @@ - dnl # Check for header files - dnl ############################################################ - -- mschap_sources= -- FR_SMART_CHECK_INCLUDE(membership.h) -- if test "x$ac_cv_header_membership_h" = "xyes"; then -+ if test "x$winbind_omit" = "xyes"; then -+ AC_MSG_WARN([building without support for direct authentication via winbind]) -+ else -+ mschap_sources= -+ FR_SMART_CHECK_INCLUDE(membership.h) -+ if test "x$ac_cv_header_membership_h" = "xyes"; then - AC_DEFINE([HAVE_MEMBERSHIP_H],[1],[Build with Apple Open Directory support]) - mschap_sources="$mschap_sources opendir.c" - mod_ldflags="-framework DirectoryService" -- fi -+ fi - -- smart_try_dir="$winbind_include_dir /usr/include/samba-4.0" -- FR_SMART_CHECK_INCLUDE(wbclient.h, [#include -+ smart_try_dir="$winbind_include_dir /usr/include/samba-4.0" -+ FR_SMART_CHECK_INCLUDE(wbclient.h, [#include - #include ]) -- if test "x$ac_cv_header_wbclient_h" != "xyes"; then -+ if test "x$ac_cv_header_wbclient_h" != "xyes"; then - AC_MSG_WARN([wbclient.h not found. Use --with-winbind-include-dir=.]) - AC_MSG_WARN([silently building without support for direct authentication via winbind. requires: libwbclient]) -- fi -+ fi - -- FR_SMART_CHECK_INCLUDE(core/ntstatus.h, [#include -+ FR_SMART_CHECK_INCLUDE(core/ntstatus.h, [#include - #include ]) -- if test "x$ac_cv_header_core_ntstatus_h" != "xyes"; then -+ if test "x$ac_cv_header_core_ntstatus_h" != "xyes"; then - AC_MSG_WARN([core/ntstatus.h not found. Use --with-winbind-include-dir=.]) - AC_MSG_WARN([silently building without support for direct authentication via winbind. requires: libwbclient]) -- fi -- -- dnl ############################################################ -- dnl # Check for libraries -- dnl ############################################################ -- -- if test "x$ac_cv_header_wbclient_h" = "xyes" && \ -- test "x$ac_cv_header_core_ntstatus_h" = "xyes"; then -+ fi - -- smart_try_dir="$winbind_lib_dir" -- FR_SMART_CHECK_LIB(wbclient, wbcCtxAuthenticateUserEx) -- if test "x$ac_cv_lib_wbclient_wbcCtxAuthenticateUserEx" != "xyes"; then -- AC_MSG_WARN([winbind libraries not found. Use --with-winbind-lib-dir=.]) -- AC_MSG_WARN([Samba must be version 4.2.1 or higher to use this feature.]) -- else -- mschap_sources="$mschap_sources auth_wbclient.c" -- AC_DEFINE([WITH_AUTH_WINBIND],[1],[Build with direct winbind auth support]) -+ dnl ############################################################ -+ dnl # Check for libraries -+ dnl ############################################################ -+ -+ if test "x$ac_cv_header_wbclient_h" = "xyes" && \ -+ test "x$ac_cv_header_core_ntstatus_h" = "xyes"; then -+ -+ smart_try_dir="$winbind_lib_dir" -+ FR_SMART_CHECK_LIB(wbclient, wbcCtxAuthenticateUserEx) -+ if test "x$ac_cv_lib_wbclient_wbcCtxAuthenticateUserEx" != "xyes"; then -+ AC_MSG_WARN([winbind libraries not found. Use --with-winbind-lib-dir=.]) -+ AC_MSG_WARN([Samba must be version 4.2.1 or higher to use this feature.]) -+ else -+ mschap_sources="$mschap_sources auth_wbclient.c" -+ AC_DEFINE([WITH_AUTH_WINBIND],[1],[Build with direct winbind auth support]) -+ fi - fi - fi - ---- a/src/modules/rlm_mschap/configure 2021-10-07 21:46:04.000000000 +0200 -+++ b/src/modules/rlm_mschap/configure 2022-09-24 07:03:53.673208336 +0200 -@@ -2773,7 +2773,7 @@ - if test "${with_winbind_include_dir+set}" = set; then : - withval=$with_winbind_include_dir; case "$withval" in - no) -- as_fn_error $? "Need winbind-include-dir" "$LINENO" 5 -+ winbind_omit="yes" - ;; - yes) - ;; -@@ -2790,7 +2790,7 @@ - if test "${with_winbind_lib_dir+set}" = set; then : - withval=$with_winbind_lib_dir; case "$withval" in - no) -- as_fn_error $? "Need winbind-lib-dir" "$LINENO" 5 -+ winbind_omit="yes" - ;; - yes) - ;; -@@ -2806,7 +2806,7 @@ - if test "${with_winbind_dir+set}" = set; then : - withval=$with_winbind_dir; case "$withval" in - no) -- as_fn_error $? "Need winbind-dir" "$LINENO" 5 -+ winbind_omit="yes" - ;; - yes) - ;; -@@ -2819,6 +2819,10 @@ - - - -+ if test "x$winbind_omit" = "xyes"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: building without support for direct authentication via winbind" >&5 -+$as_echo "$as_me: WARNING: building without support for direct authentication via winbind" >&2;} -+ else - - mschap_sources= - -@@ -3723,6 +3727,8 @@ - fi - fi - -+fi -+ - targetname=rlm_mschap - else - targetname= diff --git a/net-dialup/freeradius/files/radius.conf-r6 b/net-dialup/freeradius/files/radius.conf-r6 deleted file mode 100644 index 50d2a1c..0000000 --- a/net-dialup/freeradius/files/radius.conf-r6 +++ /dev/null @@ -1,22 +0,0 @@ -# Config file for /etc/init.d/radiusd - -# see man pages for radiusd run `radiusd -h` -# for valid cmdline options -#RADIUSD_OPTS="" - -# Change this value if you change it in /etc/raddb/radiusd.conf -pidfile=/run/radiusd/radiusd.pid - -# Change these values if you change them in /etc/raddb/radiusd.conf -RADIUSD_USER=radius -RADIUSD_GROUP=radius - -RADIUSD_LOGPATH=/var/log/radius - -# If you set up logging to syslog in /etc/raddb/radiusd.conf, you want -# to uncomment the following line. -#rc_use="logger" - -# If you use ldap, start the ldap server prior to FreeRADIUS to avoid -# startup crashes. -#rc_use="ldap" diff --git a/net-dialup/freeradius/files/radius.init-r4 b/net-dialup/freeradius/files/radius.init-r4 deleted file mode 100644 index dee1842..0000000 --- a/net-dialup/freeradius/files/radius.init-r4 +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -command=/usr/sbin/radiusd -command_args="${RADIUSD_OPTS}" -pidfile="${pidfile:-/run/radiusd/radiusd.pid}" -extra_started_commands="reload" - -depend() { - need localmount - use dns -} - -start_pre() { - if [ ! -f /etc/raddb/radiusd.conf ] ; then - eerror "No /etc/raddb/radiusd.conf file exists!" - return 1 - fi - - checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \ - $(dirname ${pidfile}) "${RADIUSD_LOGPATH:-/var/log/radius}" - checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \ - $(dirname ${pidfile}) /run/radiusd -} - -reload() { - ebegin "Reloading radiusd" - kill -HUP $(cat ${pidfile}) - eend $? -} diff --git a/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild b/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild deleted file mode 100644 index cbc32ff..0000000 --- a/net-dialup/freeradius/freeradius-3.0.25-r2.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit autotools pam python-single-r1 systemd - -MY_PV=$(ver_rs 1- "_") - -DESCRIPTION="Highly configurable free RADIUS server" -HOMEPAGE="https://freeradius.org/" -SRC_URI="https://github.com/FreeRADIUS/freeradius-server/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/freeradius-server-release_${MY_PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86" - -IUSE=" - debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam - pcap postgres python readline redis rest samba sqlite ssl systemd -" - -RESTRICT="test firebird? ( bindist )" - -# NOTE: Temporary freeradius doesn't support linking with mariadb client -# libs also if code is compliant, will be available in the next release. -# (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a - -# TODO: rlm_mschap works with both samba library or without. I need to avoid -# linking of samba library if -samba is used. -RDEPEND="acct-group/radius - acct-user/radius - !net-dialup/cistronradius - dev-lang/perl:= - sys-libs/gdbm:= - sys-libs/talloc - virtual/libcrypt:= - firebird? ( dev-db/firebird ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap:= ) - memcached? ( dev-libs/libmemcached ) - mysql? ( dev-db/mysql-connector-c:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 ) - odbc? ( dev-db/unixODBC ) - oracle? ( dev-db/oracle-instantclient[sdk] ) - pam? ( sys-libs/pam ) - pcap? ( net-libs/libpcap ) - postgres? ( dev-db/postgresql:= ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - redis? ( dev-libs/hiredis:= ) - rest? ( dev-libs/json-c:= ) - samba? ( net-fs/samba ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( - dev-libs/openssl:0=[-bindist(-)] - ) - systemd? ( sys-apps/systemd )" -DEPEND="${RDEPEND}" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -# 721040 -QA_SONAME="usr/lib.*/libfreeradius-.*.so" - -PATCHES=( - "${FILESDIR}"/${PN}-3.0.20-systemd-service.patch - "${FILESDIR}"/${PN}-3.0.25-samba.patch -) - -pkg_setup() { - if use python ; then - python-single-r1_pkg_setup - export PYTHONBIN="${EPYTHON}" - fi -} - -src_prepare() { - # most of the configuration options do not appear as ./configure - # switches. Instead it identifies the directories that are available - # and run through them. These might check for the presence of - # various libraries, in which case they are not built. To avoid - # automagic dependencies, we just remove all the modules that we're - # not interested in using. - - eapply_user - default - - use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; } - use ldap || { rm -r src/modules/rlm_ldap || die ; } - use kerberos || { rm -r src/modules/rlm_krb5 || die ; } - use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; } - use pam || { rm -r src/modules/rlm_pam || die ; } - # Drop support of python2 - rm -r src/modules/rlm_python || die - use python || { rm -r src/modules/rlm_python3 || die ; } - use rest || { rm -r src/modules/rlm_rest || die ; } - use redis || { rm -r src/modules/rlm_redis{,who} || die ; } - # Do not install ruby rlm module, bug #483108 - rm -r src/modules/rlm_ruby || die - - # these are all things we don't have in portage/I don't want to deal - # with myself - rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library - rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2 - rm -r src/modules/rlm_opendirectory || die # requires some membership.h - rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die - - # sql drivers that are not part of experimental are loaded from a - # file, so we have to remove them from the file itself when we - # remove them. - usesqldriver() { - local flag=$1 - local driver=rlm_sql_${2:-${flag}} - - if ! use ${flag}; then - rm -r src/modules/rlm_sql/drivers/${driver} || die - sed -i -e /${driver}/d src/modules/rlm_sql/stable || die - fi - } - - sed -i \ - -e 's:^#\tuser = :\tuser = :g' \ - -e 's:^#\tgroup = :\tgroup = :g' \ - -e 's:/var/run/radiusd:/run/radiusd:g' \ - -e '/^run_dir/s:${localstatedir}::g' \ - raddb/radiusd.conf.in || die - - # verbosity - # build shared libraries using jlibtool -shared - sed -i \ - -e '/$(LIBTOOL)/s|--quiet ||g' \ - -e 's:--mode=\(compile\|link\):& -shared:g' \ - Make.inc.in || die - - sed -i \ - -e 's|--silent ||g' \ - -e 's:--mode=\(compile\|link\):& -shared:g' \ - scripts/libtool.mk || die - - # crude measure to stop jlibtool from running ranlib and ar - sed -i \ - -e '/LIBRARIAN/s|".*"|"true"|g' \ - -e '/RANLIB/s|".*"|"true"|g' \ - scripts/jlibtool.c || die - - usesqldriver mysql - usesqldriver postgres postgresql - usesqldriver firebird - usesqldriver iodbc - usesqldriver odbc unixodbc - usesqldriver oracle - usesqldriver sqlite - usesqldriver mongodb mongo - - eautoreconf -} - -src_configure() { - # do not try to enable static with static-libs; upstream is a - # massacre of libtool best practices so you also have to make sure - # to --enable-shared explicitly. - local myeconfargs=( - --enable-shared - --disable-static - --disable-ltdl-install - --with-system-libtool - --with-system-libltdl - --with-ascend-binary - --with-udpfromto - --with-dhcp - --with-iodbc-include-dir=/usr/include/iodbc - --with-experimental-modules - --with-docdir=/usr/share/doc/${PF} - --with-logdir=/var/log/radius - $(use_enable debug developer) - $(use_with ldap edir) - $(use_with ssl openssl) - $(use_with systemd systemd) - ) - # fix bug #77613 - if has_version app-crypt/heimdal; then - myeconfargs+=( --enable-heimdal-krb5 ) - fi - - if use python ; then - myeconfargs+=( - --with-rlm-python3-bin=${EPYTHON} - --with-rlm-python3-config-bin=${EPYTHON}-config - ) - fi - - if ! use samba ; then - myeconfargs+=( - --without-winbind-dir - ) - fi - - use readline || export ac_cv_lib_readline=no - use pcap || export ac_cv_lib_pcap_pcap_open_live=no - - econf "${myeconfargs[@]}" -} - -src_compile() { - # verbose, do not generate certificates - emake \ - Q='' ECHO=true \ - LOCAL_CERT_PRODUCTS='' -} - -src_install() { - dodir /etc - diropts -m0750 -o root -g radius - dodir /etc/raddb - diropts -m0750 -o radius -g radius - dodir /var/log/radius - keepdir /var/log/radius/radacct - diropts - - # verbose, do not install certificates - # Parallel install fails (#509498) - emake -j1 \ - Q='' ECHO=true \ - LOCAL_CERT_PRODUCTS='' \ - R="${D}" \ - install - - if use pam; then - pamd_mimic_system radiusd auth account password session - fi - - # fix #711756 - fowners -R radius:radius /etc/raddb - fowners -R radius:radius /var/log/radius - - dodoc CREDITS - - rm "${ED}/usr/sbin/rc.radiusd" || die - - newinitd "${FILESDIR}/radius.init-r4" radiusd - newconfd "${FILESDIR}/radius.conf-r6" radiusd - - if ! use systemd ; then - # If systemd builtin is not enabled we need use Type=Simple - # as systemd .service - sed -i -e 's:^Type=.*::g' \ - -e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \ - "${S}"/debian/freeradius.service - fi - systemd_dounit "${S}"/debian/freeradius.service - - find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die -} - -pkg_config() { - if use ssl; then - cd "${ROOT}"/etc/raddb/certs || die - ./bootstrap || die "Error while running ./bootstrap script." - chown root:radius "${ROOT}"/etc/raddb/certs || die - chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die - chown root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die - fi -} - -pkg_preinst() { - if ! has_version ${CATEGORY}/${PN} && use ssl; then - elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able" - elog "to start the radiusd service." - fi -} diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest deleted file mode 100644 index 126e8c3..0000000 --- a/www-client/opera/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 -DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b -EBUILD opera-12.16_p1860-r1.ebuild 5856 BLAKE2B d0a4b60a31890f5c7de5e2e93ba592812011e6ea623bba69f6c61d7146cce0cfd7475b58952bd4cc42af61d1a46504457c3d13af4f1827362bd32f6a37445f80 SHA512 53ff6f14efc73ea822e0dfb83210163d22671b2aff5bd0793c8fb517eaabfb378c43effddd72036cb88031a5e44b599df84a074b30970903b4a0ef4e63fe7073 diff --git a/www-client/opera/opera-12.16_p1860-r1.ebuild b/www-client/opera/opera-12.16_p1860-r1.ebuild deleted file mode 100644 index 50d3c00..0000000 --- a/www-client/opera/opera-12.16_p1860-r1.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils gnome2-utils multilib pax-utils versionator xdg-utils - -DESCRIPTION="A fast and secure web browser and Internet suite" -HOMEPAGE="https://www.opera.com/" - -SLOT="0" -LICENSE="OPERA-12 LGPL-2 LGPL-3" -KEYWORDS="amd64 x86" -IUSE="elibc_FreeBSD gtk multilib" - -O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00 -O_B="$(get_version_component_range 3)" # Build number, i.e. 1156 - -# == Variables that often change == -# All other variables should be accounted for by _pre/_p - -O_K="noserch" # The key to the snapshot URL - -O_LINGUAS=" - af ar az be bg bn cnr cs da de el en-GB es-419 es-ES et fa fi fr fr-CA fy - gd he hi hr hu id it ja ka kk ko lt lv mk ms nb nl nn pa pl pt pt-BR ro ru - sk sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu -" # Supported linguas - -# == End of variables that often change == - -if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then # snapshot: _pre - HOMEPAGE="https://my.opera.com/desktopteam/blog/" - - O_D="${O_K}_${O_V}-${O_B/pre}" # directory string - O_P="${PN}-${O_V}-${O_B/pre}" # package string - O_U="https://snapshot.opera.com/unix/" # base URI - - SRC_URI=" - amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz ) - x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz ) - " -else # release: _p - O_D="${O_V/./}" # directory string - O_P="${PN}-${O_V}-${O_B/p}" # package string - O_U="mirror://opera/" # base URI - - SRC_URI=" - amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz ) - x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz ) - " -fi - -for O_LINGUA in ${O_LINGUAS}; do - IUSE+=" l10n_${O_LINGUA}" -done - -DEPEND=" - >=sys-apps/sed-4 - app-arch/xz-utils -" -GTKRDEPEND=" - dev-libs/atk - dev-libs/glib:2 - x11-libs/cairo - x11-libs/gdk-pixbuf - gtk? ( x11-libs/gtk+:2 ) - x11-libs/pango - x11-libs/pixman -" -RDEPEND=" - media-libs/fontconfig - media-libs/freetype - sys-libs/zlib - virtual/opengl - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXrender - x11-libs/libXt - x11-misc/xdg-utils - gtk? ( ${GTKRDEPEND} ) -" - -QA_PREBUILT="*" - -pkg_setup() { - OPREFIX="/usr/$(get_abi_LIBDIR)" -} - -src_unpack() { - unpack ${A} - mv -v ${PN}* "${S}" || die -} - -src_prepare() { - default - - local LNGDIR="share/${PN}/locale" - - # Count linguas - count() { echo ${#}; } - local lingua_count=$(count ${O_LINGUAS} en) - local locale_count=$(count ${LNGDIR}/*) - [[ ${lingua_count} = ${locale_count} ]] \ - || die "Number of LINGUAS does not match number of locales" - unset count - - # Remove unwanted linguas - for LINGUA in ${O_LINGUAS}; do - if ! use l10n_${LINGUA}; then - # Remap codes for Montenegrin and Spanish (Latin America) - case ${LINGUA} in - cnr) LINGUA=me ;; - es-419) LINGUA=es-LA ;; - esac - LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-}) - rm -r "${LINGUA}" || die "The list of linguas needs to be fixed" - fi - done - - # Remove doc directory but keep the LICENSE under another name (bug #315473) - mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt - rm -rf share/doc - for locale in share/${PN}/locale/*; do - rm -f "${locale}/license.txt" - ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \ - || die - done - - # Remove package directory - rm -rf share/${PN}/package - - rm -r lib/${PN}/gstreamer || die - - # Optional libraries - if ! use gtk; then - rm lib/${PN}/liboperagtk2.so || die - fi - - rm lib/${PN}/liboperakde4.so || die - - if use amd64 && ! use multilib; then - rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die - fi - - # Unzip the man pages before sedding - gunzip share/man/man1/* || die - - local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX= - if [[ ${PN} = opera-next ]]; then - OPERA_SUFFIX="-next" - OPERA__SUFFIX=" Next" - OPERA_USUFFIX="-NEXT" - fi - - # Replace PREFIX, SUFFIX and PN in various files - sed -i \ - -e "s:@@{PREFIX}:/usr:g" \ - -e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \ - -e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \ - -e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \ - share/man/man1/* \ - share/mime/packages/* \ - share/applications/${PN}-*.desktop \ - || die - - # Create /usr/bin/opera wrapper - echo '#!/bin/sh' > ${PN} - echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN} - echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \ - >> ${PN} - echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN} - - # Change libfreetype.so.9 to libfreetype.so.6 for Gentoo/FreeBSD, bug #477594 - if use elibc_FreeBSD; then - scanelf -qR -N libfreetype.so.9 -F "#N" lib/${PN}/ | \ - while read i; do - if [[ $(strings "$i" | fgrep -c libfreetype.so.9) -ne 1 ]]; - then - export SANITY_CHECK_LIBFREETYPE_FAILED=1 - break - fi - sed -i \ - "$i" \ - -e 's/libfreetype\.so\.9/libfreetype.so.6/g' - done - [[ "$SANITY_CHECK_LIBFREETYPE_FAILED" = "1" ]] && die - fi -} - -src_install() { - # We install into usr instead of opt as Opera does not support the latter - dodir /usr - if ! use elibc_FreeBSD; then - rm lib/${PN}/opera_autoupdatechecker || die - fi - mv lib/ "${D}/${OPREFIX}" || die - mv share/ "${D}/usr/" || die - - # Install startup scripts - dobin ${PN} - - # Stop revdep-rebuild from checking opera binaries - dodir /etc/revdep-rebuild - echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \ - > "${D}"/etc/revdep-rebuild/90${PN} - - # Set PaX markings for hardened/PaX (bug #344267) - pax-mark m $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) ) -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - if use elibc_FreeBSD; then - elog - elog "To improve shared memory usage please set:" - elog "$ sysctl kern.ipc.shm_allow_removed=1" - fi - - # Update desktop file database and gtk icon cache (bug #334993) - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - # Update desktop file database and gtk icon cache (bug #334993) - gnome2_icon_cache_update - xdg_desktop_database_update -}