summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/ps_mem/ps_mem-3.14-r1.ebuild28
-rw-r--r--eclass/elisp-common.eclass3
-rw-r--r--eclass/multilib.eclass2
-rw-r--r--net-misc/dropbox/Manifest4
-rw-r--r--net-misc/dropbox/dropbox-171.4.6182.ebuild110
-rw-r--r--net-misc/dropbox/dropbox-172.4.7555.ebuild110
-rw-r--r--net-misc/dropbox/dropbox-173.4.6706.ebuild2
-rw-r--r--sys-apps/memtest86+/Manifest1
-rw-r--r--sys-apps/memtest86+/memtest86+-6.20.ebuild78
9 files changed, 110 insertions, 228 deletions
diff --git a/app-admin/ps_mem/ps_mem-3.14-r1.ebuild b/app-admin/ps_mem/ps_mem-3.14-r1.ebuild
new file mode 100644
index 000000000000..118fbba1a322
--- /dev/null
+++ b/app-admin/ps_mem/ps_mem-3.14-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A utility to report core memory usage per program"
+HOMEPAGE="https://github.com/pixelb/ps_mem"
+SRC_URI="https://github.com/pixelb/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+python_install() {
+ distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ doman ${PN}.1
+}
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 0462f022d1ba..1f60d3c337b9 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -11,7 +11,7 @@
# Christian Faulhammer <fauli@gentoo.org>
# Ulrich Müller <ulm@gentoo.org>
# Maciej Barć <xgqt@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: Emacs-related installation utilities
# @DESCRIPTION:
#
@@ -167,7 +167,6 @@
# to above calls of elisp-site-regen().
case ${EAPI} in
- 6) inherit eapi7-ver ;;
7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 4a6e4160d5cb..77340a23e30f 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -26,7 +26,7 @@ export CFLAGS_default
export LDFLAGS_default
export CHOST_default=${CHOST_default:-${CHOST}}
export CTARGET_default=${CTARGET_default:-${CTARGET:-${CHOST_default}}}
-export LIBDIR_default=${CONF_LIBDIR:-"lib"}
+export LIBDIR_default="lib"
export KERNEL_ABI=${KERNEL_ABI:-${DEFAULT_ABI}}
# @FUNCTION: has_multilib_profile
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index d03caf26606a..611d9e4f726e 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,7 +1,3 @@
DIST DropboxGlyph_Blue.svg 605 BLAKE2B 6c488bd261293b22da98035935ddfa9247bedbc6f4da2f9fc2470af802c1f4f597ac88b01b5bef9e77e1e717267f633d6a04af2ccfd3c5f9dbff22fbceaf9a91 SHA512 9202344b904dcd7955e5a355dadf537d1544140d74f8a33bdc40e18e36661e3a474d11cf17613eaebf4e76c170d8413d99abdedfb8635784bcd6892b4b259712
-DIST dropbox-lnx.x86-171.4.6182.tar.gz 110173976 BLAKE2B cfc2fb882d61b5055546a7eabc6a525927bb9aaaac4fd49b23d7d140b77e1a78b80f0bb9679918b91fd81dd60cd11008d2a4c0bcb6247eff4d4711ef7e5f8e41 SHA512 681b6373ca5448a49e0e265ee2f78965ee17b0e565af7a260d437138837049371ddd135b6c73ac43afe896ac7806bd45da5c197b510c32de392932400562ecb7
-DIST dropbox-lnx.x86-172.4.7555.tar.gz 110226499 BLAKE2B 227838fa4a705a8d3ddd119c2585a04b7232ea6f4cea1eb863b061da4275a1906182d01540e63c5699d74c4b9caff29beff35e68d7e8be9d1eff80ab7a92f760 SHA512 0c5ab49c5561a823f82f6e36d4f9cdbb9206de9a8d7f3af167ddc07f32c6c9f9f53e0e1a6b580065a190cfc357579b54e86e37f75fd8b382ca986268471c2dda
DIST dropbox-lnx.x86-173.4.6706.tar.gz 110412404 BLAKE2B 644066ba8a55dea4e00a7db600e9456958e98ab40884a678d452c2425c20c72b44511894f3ce1881c1c5c55370909381fce26f76c451069b4f4e38e478de7800 SHA512 48debab42a0047051bfacd232257e1b64ae50b1927224c5aaa4b015b9617eb2546affbcd69a2d56742f843438ea20e74d0d45a6f684687fa8907e41174dd213b
-DIST dropbox-lnx.x86_64-171.4.6182.tar.gz 111736593 BLAKE2B 66386df7b59fd0078c621de0da14ce9474dd9386daa57938bfbf195ab9edd26cb87322898d1c4dc702f5f141048671dbd6024da190846785e6fa0ffe7975b82f SHA512 d881bcedefdd39202f0730999bcfa30dc3b728d82a0c381603843413a58c7995df5c64a77a125fd529db552a8020601f5b46b82cd6e614d64da0184b7334ab81
-DIST dropbox-lnx.x86_64-172.4.7555.tar.gz 111837671 BLAKE2B 17483cd9b6833a4f59e14816a7f6ba9e1412552764d873e9e7831cac913a87f59d85cc9c946f648adee7c8a5b7f891666debc029cbd863d2209e9e62a003e134 SHA512 047e35edc230e86fd2393b9c082f5bd60780e7b686c8b0faff8df7ae6160d171db41e8654f7d50bf34ca6d3a2cebbba99d5e964413f156f30b3f7b3328418a7f
DIST dropbox-lnx.x86_64-173.4.6706.tar.gz 112095704 BLAKE2B 8b6ce644bfe38bde1cbb70ae37b963c286c39a2b528673cc076b1e537b3407b72e0e29b4cd3e310bffeb2d87190c1f2a7f989276f498f66062fc846a6d262523 SHA512 fb9cc436024a99bbb600e04bf9bd25bc2689ec6a8f5dd70def3f4018c4e76f32d9f5e47704739d4ee9b9775e3d9873d2a49df58b2b8b922279fa738475c74804
diff --git a/net-misc/dropbox/dropbox-171.4.6182.ebuild b/net-misc/dropbox/dropbox-171.4.6182.ebuild
deleted file mode 100644
index b0b4cee9bbeb..000000000000
--- a/net-misc/dropbox/dropbox-171.4.6182.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
- amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
- x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
- https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
- X? (
- x11-themes/hicolor-icon-theme
- )
- selinux? ( sec-policy/selinux-dropbox )
- app-arch/bzip2
- dev-libs/glib:2
- dev-libs/libffi-compat:6
- media-libs/fontconfig
- media-libs/freetype
- net-misc/wget
- sys-libs/zlib
- sys-libs/ncurses-compat:5
- virtual/opengl
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libxcb
-"
-
-src_unpack() {
- unpack ${A}
- mkdir -p "${S}" || die
- mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
- mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
- rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
- rmdir .dropbox-dist || die
-}
-
-src_prepare() {
- default
- # we supply all of these in RDEPEND
- rm -vf libGL.so.1 libX11* libffi.so.6 || die
- # some of these do not appear to be used
- rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
- PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \
- wmctrl libdrm.so.2 libpopt.so.0 || die
- if use X ; then
- mv images/hicolor/16x16/status "${T}" || die
- else
- rm -vrf images || die
- fi
- patchelf --set-rpath '$ORIGIN' \
- apex._apex.*.so \
- nucleus_python.*.so \
- tprt.*.so \
- || die
- pax-mark cm dropbox
- mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
- local targetdir="/opt/dropbox"
-
- insinto "${targetdir}"
- doins -r *
- fperms a+x "${targetdir}"/{dropbox,dropboxd}
- dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
- if use X; then
- doicon -s 16 -c status "${T}"/status
- newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
- fi
-
- make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
- newinitd "${FILESDIR}"/dropbox.initd dropbox
- newconfd "${FILESDIR}"/dropbox.conf dropbox
- systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
- dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
- einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
- einfo " your user's home directory. To prevent this, run the following as"
- einfo " each user who will run dropbox:"
- einfo ""
- einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-172.4.7555.ebuild b/net-misc/dropbox/dropbox-172.4.7555.ebuild
deleted file mode 100644
index e1949fb60f88..000000000000
--- a/net-misc/dropbox/dropbox-172.4.7555.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
- amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
- x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
- https://www.dropbox.com/sh/42f8d4kq6yt5lte/AAD69lhaw6gy46W8HfQAm0GSa/Glyph/Dropbox/SVG/DropboxGlyph_Blue.svg
-"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
- X? (
- x11-themes/hicolor-icon-theme
- )
- selinux? ( sec-policy/selinux-dropbox )
- app-arch/bzip2
- dev-libs/glib:2
- dev-libs/libffi-compat:6
- media-libs/fontconfig
- media-libs/freetype
- net-misc/wget
- sys-libs/zlib
- sys-libs/ncurses-compat:5
- virtual/opengl
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libxcb
-"
-
-src_unpack() {
- unpack ${A}
- mkdir -p "${S}" || die
- mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
- mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
- rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
- rmdir .dropbox-dist || die
-}
-
-src_prepare() {
- default
- # we supply all of these in RDEPEND
- rm -vf libGL.so.1 libX11* libffi.so.6 || die
- # some of these do not appear to be used
- rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
- PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.* \
- wmctrl libdrm.so.2 libpopt.so.0 || die
- if use X ; then
- mv images/hicolor/16x16/status "${T}" || die
- else
- rm -vrf images || die
- fi
- patchelf --set-rpath '$ORIGIN' \
- apex._apex.*.so \
- nucleus_python.*.so \
- tprt.*.so \
- || die
- pax-mark cm dropbox
- mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
- local targetdir="/opt/dropbox"
-
- insinto "${targetdir}"
- doins -r *
- fperms a+x "${targetdir}"/{dropbox,dropboxd}
- dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
- if use X; then
- doicon -s 16 -c status "${T}"/status
- newicon -s scalable "${DISTDIR}/DropboxGlyph_Blue.svg" dropbox.svg
- fi
-
- make_desktop_entry "${PN}" "Dropbox" "dropbox"
-
- newinitd "${FILESDIR}"/dropbox.initd dropbox
- newconfd "${FILESDIR}"/dropbox.conf dropbox
- systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
- dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
- einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
- einfo " your user's home directory. To prevent this, run the following as"
- einfo " each user who will run dropbox:"
- einfo ""
- einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-173.4.6706.ebuild b/net-misc/dropbox/dropbox-173.4.6706.ebuild
index e1949fb60f88..b0b4cee9bbeb 100644
--- a/net-misc/dropbox/dropbox-173.4.6706.ebuild
+++ b/net-misc/dropbox/dropbox-173.4.6706.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
IUSE="selinux X"
RESTRICT="mirror strip"
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index be3f4b764570..a49e75d87f01 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,2 +1,3 @@
DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
DIST memtest86+-6.10.tar.gz 230056 BLAKE2B 2462c31f1ca27aa166c447e51a9b388872faaf7f845100a122f5dd8eb11dc76e26c503dc14d0825bda397c7180a5259094a020d25dd9d43b1997bfbe424c7f65 SHA512 2fb8e6d375f7ced53b1c2d50ffeeafcee1282b2495ea4241958e210c0b4a3500701025041469459c0db1662c448a3b65a51a994d19bc8ac217e23fa935700e42
+DIST memtest86+-6.20.tar.gz 232436 BLAKE2B 6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a991cccc0a5586cac966 SHA512 b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0
diff --git a/sys-apps/memtest86+/memtest86+-6.20.ebuild b/sys-apps/memtest86+/memtest86+-6.20.ebuild
new file mode 100644
index 000000000000..ba53cf25aeee
--- /dev/null
+++ b/sys-apps/memtest86+/memtest86+-6.20.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit mount-boot toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Memory tester based on PCMemTest"
+HOMEPAGE="https://www.memtest.org/"
+SRC_URI="https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bios32 bios64 +boot efi32 efi64 iso32 iso64"
+
+ISODEPS="
+ dev-libs/libisoburn
+ sys-fs/dosfstools
+ sys-fs/mtools
+"
+BDEPEND="
+ iso32? ( ${ISODEPS} )
+ iso64? ( ${ISODEPS} )
+"
+
+S=${WORKDIR}/memtest86plus-${MY_PV}
+
+src_prepare() {
+ sed -i \
+ -e 's#/sbin/mkdosfs#mkfs.vfat#' \
+ -e 's/^AS = as/AS +=/' \
+ -e '/^CC/d' \
+ -e 's/objcopy/$(OBJCOPY)/' \
+ -e 's/shell size/shell $(SIZE)/' \
+ build{32,64}/Makefile || die
+ default
+}
+
+src_compile() {
+ tc-export OBJCOPY
+ export SIZE=$(tc-getPROG SIZE size)
+ pushd build32
+ use bios32 && emake memtest.bin
+ use efi32 && emake memtest.efi
+ use iso32 && emake iso
+ popd
+
+ pushd build64
+ use bios64 && emake memtest.bin
+ use efi64 && emake memtest.efi
+ use iso64 && emake iso
+ popd
+}
+
+install_memtest_images() {
+ use bios32 && newins build32/memtest.bin memtest32.bios
+ use bios64 && newins build64/memtest.bin memtest64.bios
+ use efi32 && newins build32/memtest.efi memtest.efi32
+ use efi64 && newins build64/memtest.efi memtest.efi64
+}
+
+src_install() {
+ default
+ if use boot; then
+ exeinto /etc/grub.d/
+ newexe "${FILESDIR}"/39_memtest86+-r2 39_memtest86+
+ insinto /boot/memtest86plus
+ install_memtest_images
+ fi
+
+ insinto /usr/share/${PN}
+ install_memtest_images
+ use iso32 && newins build32/memtest.iso memtest32.iso
+ use iso64 && newins build64/memtest.iso memtest64.iso
+}