7 files changed, 114 insertions, 144 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1f17c32d4ed1..b0125b6d4f46 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 5e7fde18dd17..b297587d7d02 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -5,7 +5,9 @@ DIST dropbox-icon.svg 574 BLAKE2B a73a0906b5b03dc3214010736164fcdbceb6d91463ed95
 DIST dropbox-lnx.x86_64-209.4.3661.tar.gz 117384855 BLAKE2B 509c1e3b8eab3e44b6b713988b7bebc83f9ee62c94100fceb163496d5b419c4caaf933f9646e21ad996a303140639b7de44b2a52fac942adc23a1973a86149ab SHA512 769c3063f87732ecc82e44e1de7ffa581d313fbdecf2230304730ab58da0e4a0bf284e3188897d066c961a5e25316c481b47d46e6dc015a5b974ade7074a4b54
 DIST dropbox-lnx.x86_64-210.4.4854.tar.gz 117607664 BLAKE2B 402717c16c063de5b506826cdf2862eab009e3b8c28eda64deebc7dc9637947c1d46dec183a99bab3353257e1ca118e4fe72f390537175038a0b25eb7adc8a6a SHA512 4331999d87e7326dd6a60bb1aebce94326e776a595f6222bd9238a4225139b84324bde6215162aece0eb87868e1e6320092ba40d6fff684dbdc39535dc5426b4
 DIST dropbox-lnx.x86_64-211.4.6008.tar.gz 113807403 BLAKE2B 893e8e7480b44551b79581172d908f7caa76fe8df54704f0fff3bb02bd0885ca07f0feb3a8cb70f7f21abdc9534204acf95d9ffa62b72bda3ca17ef9b9a271ac SHA512 e734581117dcc78c72cb925316a88def7d094b04058b6753d498fc258a82bddb9a920e546c92ddd441d9ed0e9b8e6109c4924e2a14da1414166dec7c26a651ce
+DIST dropbox-lnx.x86_64-212.4.5767.tar.gz 113020508 BLAKE2B ac8ee381a4e28f84cdb1103e30bf2e1f2e948340e62811381961d90c3b49886133b0a64c62f06de0fb17d1e753b3bb854518ec1e94f779dcdd351dff1f349ba4 SHA512 c2d827794186be2ff40bc58048885e21a360410d8a00b142ae184e72a0982a50a02a1ab02cdad38957e66413b020bd08c41d86da6818b30694b1ad21316ae3fb
 EBUILD dropbox-209.4.3661.ebuild 2714 BLAKE2B 96ce9edca9c1a5b5242fdecc74d1a84db77643d9bc179a6f123149326311b28e8e146d4aa7a76099e5642dc4b925669ecb16810bdfe9564c0e6d6fddf326988e SHA512 fa06510dc66a2e54d1b2c8f86b1ebecab259e6381eb78cb1ec24fb5a04c370455fdc783fea5c4e3f46d98c7a70f156df80394d8317b3855405142f864ae93d7f
 EBUILD dropbox-210.4.4854.ebuild 2715 BLAKE2B 7e8e784d7698892ae3ef7b7baabeb6a8e89f96545b65a69702c1ed4389db96c3681aaf17c8338f7fdc0aec38cd89cfd03735ba2ad92fedd7ed0bc97a3f3d4c3f SHA512 1d03fbd01bdc7999d39ad8b5737cd0967f71242ec16dc5c9e3feff84a1481743db62ebc0f13065383521ed46cd511fc29dba8fb17b5606586f1be94bb475472f
 EBUILD dropbox-211.4.6008.ebuild 2715 BLAKE2B 7e8e784d7698892ae3ef7b7baabeb6a8e89f96545b65a69702c1ed4389db96c3681aaf17c8338f7fdc0aec38cd89cfd03735ba2ad92fedd7ed0bc97a3f3d4c3f SHA512 1d03fbd01bdc7999d39ad8b5737cd0967f71242ec16dc5c9e3feff84a1481743db62ebc0f13065383521ed46cd511fc29dba8fb17b5606586f1be94bb475472f
+EBUILD dropbox-212.4.5767.ebuild 2715 BLAKE2B 7e8e784d7698892ae3ef7b7baabeb6a8e89f96545b65a69702c1ed4389db96c3681aaf17c8338f7fdc0aec38cd89cfd03735ba2ad92fedd7ed0bc97a3f3d4c3f SHA512 1d03fbd01bdc7999d39ad8b5737cd0967f71242ec16dc5c9e3feff84a1481743db62ebc0f13065383521ed46cd511fc29dba8fb17b5606586f1be94bb475472f
 MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-212.4.5767.ebuild b/net-misc/dropbox/dropbox-212.4.5767.ebuild
new file mode 100644
index 000000000000..9aafe425d4d6
--- /dev/null
+++ b/net-misc/dropbox/dropbox-212.4.5767.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz
+	https://uxwing.com/wp-content/themes/uxwing/download/brands-and-social-media/dropbox-icon.svg
+"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+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}/dropbox-icon.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/lyricwikia/Manifest b/net-misc/lyricwikia/Manifest
index 6560e37445b6..4998bda581f2 100644
--- a/net-misc/lyricwikia/Manifest
+++ b/net-misc/lyricwikia/Manifest
@@ -2,4 +2,4 @@ AUX lyricwikia-0.1.11-skip-online-test.patch 506 BLAKE2B 92bf9826dd35d483fdabae0
 DIST lyricwikia-0.1.11.tar.gz 5571 BLAKE2B 1e2fb5400b4c0ed07d419e577e3c12c6b8eca749ce1a5b7dea51d6d055979722b82d003eac20402da873d3011d1b444c0783935adbc01ec99dd6079b234e6bc7 SHA512 53ff9a2837ccc10be62c2a92240e9849a9c88b7979f8058deff87ce6eda6e98e39fb86c78052de9a885db679cd87a6c5749af2f9502d3316fbbf2c0796718805
 EBUILD lyricwikia-0.1.11-r1.ebuild 1319 BLAKE2B 88b2507dd610d72229663cbb154f75882237909a009be8aa33195bcb5b92214bfae169a0420d164b1bb0f386f97c635fc63a39cd11cc4218556673ab1bf94244 SHA512 358906eba20db0ff3bbda15496d77a638947eb8f78902fc386798c9cb42e48037e3673a6606d90b506f1562df7e8aa8d64ed1d6df7f0c7e502c21e9ec94e2dbc
 EBUILD lyricwikia-0.1.11-r2.ebuild 1350 BLAKE2B 754185ce161f5ecfad79ef6878e60d8630ee207b22dae048146a7866a30ea1841cacd582d870eb8a23afbdd321482db10ed542b0412c96a6bf01b61ebe05998b SHA512 39fb244209f3876fc37a7bb560d5a8e44fd0a34b256023eece44608938b302ef3249cfaef850480d89a41805f2c3ed3f446a31f44e49889bcfd05a8b9de6fc9d
-MISC metadata.xml 371 BLAKE2B 1c361d1b40b41a7ff164b8edbfbe2629b8145c39a33a05d601281ec23b8a02d866f502e5e2660544e209191373970a1b99d86ded2ecdc2f923779d5df9772820 SHA512 808b26a8659941b6dddb268cbfcd09604335a0172fc8df2e5dc0d123c9903fd9b67e7bf3aebeaba7929fe7fb84ba98163b6efb7c949bf05038d43b6f4e89df1a
+MISC metadata.xml 358 BLAKE2B b51540ee73e34027f08cceeed768affd1f14042dbac223beee95648fec56ebb66f6364fce7425670273915a4820d32ee232d3167ef595004c14764f2636aeb6b SHA512 0f55222f688183afe808a93186993147f91b7e615ea887f8067b39dd5121c011ed2761b75b739316c0a90227c0d9c89e749999c6653b13fc5f63a0c1137fb866
diff --git a/net-misc/lyricwikia/metadata.xml b/net-misc/lyricwikia/metadata.xml
index 264f58e3938d..4c3bd46031cc 100644
--- a/net-misc/lyricwikia/metadata.xml
+++ b/net-misc/lyricwikia/metadata.xml
@@ -3,8 +3,8 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@gentoo.org</email>
-		<name>Andrew Ammerlaan</name>
+		<email>nowa@gentoo.org</email>
+		<name>Nowa Ammerlaan</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 076ba14a1bbf..1f9578bb5ced 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,5 +1,3 @@
-DIST unison-2.53.3.tar.gz 1415490 BLAKE2B 1142419781f5084da7ae8d043897f2f80aa4c3770a1c5cb44f8d7f669f718c41dd7fa6d13069cd95c71842233309eb886f63ab525e5e446ff761ea970de0e794 SHA512 f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b
 DIST unison-2.53.5.tar.gz 1408926 BLAKE2B e7e3db458a485fca8820508a964df5877aed0a2d6a3ea8305298d0c6516591323f3cacdd86c4e057585c0f3b2da8a03a5a3653f543d6f1acb20701f23a81f470 SHA512 eabeed7b428f1985610b47ce8bc7faac515fd24937727612aa45435da3e38d40b6cd6d227eb3b65dc370d46458cecfca9d0e9e1712b2b7fa41b76675f8115c4c
-EBUILD unison-2.53.3-r1.ebuild 2640 BLAKE2B d59f6ff05b4f082f64bf3593379fae8fe9945847c0ac3fb1c23f70f249811fe66cb4791008886378c26291beda5be749aebb54d58c105c61ef3b67462d95764b SHA512 b074f6cd44fed516800ee19f1e65878dcae9afb0d2afae553ab3955f6499a7b81780680cac89d032d3dd8e9128e982387bb9bd01f5b8a85185bdac2de1ded109
 EBUILD unison-2.53.5-r2.ebuild 2872 BLAKE2B 4f074ef39a65e8a45297f6221f5dd61850fcb93973b473a47aa25d21588e42de70c305cae3aeaa87363c4e3ddf575d1e23ce9e7e293d7f5a5e970c3c655dcecc SHA512 a30da656b171f7d429241108ece6de1e3a0af283a2aec3fc30f1bfd37e1ae71803a1f8a817a2af23e31608bc51ba6f6723411ace00b58b81570764addf1e0882
 MISC metadata.xml 533 BLAKE2B b8ab17513b1bfdb3467fd5f728caa0e782c8092737577c7ba9fd38c064842cc06136a1e84fc76d90c9c52785d54cce6916f4930c4e582a0138ecc8bbf623bd70 SHA512 6fb4be0ee5c3750f73c080aef8724535a470607966c3b8086ae95e7e962666dabbffb2536f6859e4cfe4018c985903a78b759d3cde498b0f97ad060af3b6eead
diff --git a/net-misc/unison/unison-2.53.3-r1.ebuild b/net-misc/unison/unison-2.53.3-r1.ebuild
deleted file mode 100644
index b74dc58452c9..000000000000
--- a/net-misc/unison/unison-2.53.3-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop xdg-utils
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/
-	https://github.com/bcpierce00/unison/"
-
-if [[ "${PV}" == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/bcpierce00/${PN}.git"
-else
-	SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-	KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1-2)"
-IUSE="debug doc gui +ocamlopt +threads"
-
-BDEPEND="
-	dev-lang/ocaml:=[ocamlopt?]
-	doc? (
-		app-text/dvipsk
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-latex
-	)
-"
-DEPEND="
-	gui? (
-		dev-ml/lablgtk:3=[ocamlopt?]
-	)
-"
-RDEPEND="
-	>=dev-lang/ocaml-4.08:=
-	gui? (
-		dev-ml/lablgtk:3=[ocamlopt?]
-		|| (
-			net-misc/ssh-askpass-fullscreen
-			net-misc/x11-ssh-askpass
-		)
-	)
-"
-IDEPEND="
-	>=app-eselect/eselect-unison-0.4
-"
-
-DOCS=( src/CONTRIB src/README src/ROADMAP.txt src/TODO.txt )
-
-QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}"
-
-gui_cache_update() {
-	if use gui ; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-src_compile() {
-	local -a myconf=()
-
-	if use debug ; then
-		myconf+=( DEBUGGING=true )
-	fi
-
-	if use doc ; then
-		VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs
-	fi
-
-	if use gui ; then
-		myconf+=( UISTYLE=gtk3 )
-	else
-		myconf+=( UISTYLE=text )
-	fi
-
-	if ! use ocamlopt ; then
-		myconf+=( NATIVE=false )
-	fi
-
-	if use threads ; then
-		myconf+=( THREADS=true )
-	fi
-
-	# Discard cflags as it will try to pass them to ocamlc...
-	emake "${myconf[@]}" CFLAGS="" -j1 src manpage
-}
-
-src_test() {
-	emake test CFLAGS=""
-}
-
-src_install() {
-	# install manually, since it's just too much
-	# work to force the Makefile to do the right thing.
-	cd "${S}/src" || die
-
-	local binname
-	for binname in unison unison-fsmonitor ; do
-		exeinto /usr/bin
-		newexe "${binname}" "${binname}-${SLOT}"
-	done
-
-	cd "${S}" || die
-
-	doman "man/${PN}.1"
-
-	if use gui ; then
-		newicon -s scalable icons/U.svg "${PN}-${SLOT}.svg"
-		make_desktop_entry "${PN}-${SLOT}" "${PN} (${SLOT})" "${PN}-${SLOT}"
-	fi
-
-	if use doc ; then
-		DOCS+=( doc/unison-manual.pdf )
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
-	elog "in your profile files to access exactly this version over ssh."
-	elog "Or you can use 'eselect unison' to set the version."
-
-	eselect unison update
-
-	gui_cache_update
-}
-
-pkg_postrm() {
-	eselect unison update
-
-	gui_cache_update
-}