gentoo auto-resync : 15:10:2023 - 16:00:49

3 files changed, 101 insertions, 1 deletions

diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 0f4c3eaf38dc..ee2a850de879 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,7 +1,10 @@
 AUX shared-mime-info-2.1-itstool.patch 2841 BLAKE2B 4198fa232a034cf2c71f18973c0223af4944bc443c2b642e095cd842c8f206c20812d98d1466d50f345e35c8f61b213a58d711a3b7e515820c462e143dce9904 SHA512 af6772dc8bcceebcdc965e30f626b5ea415bbb0facff9ecaab6fadc23dbdc9ee0d72f588ac0d9637bcdf5930f30bd21102145e56def080cb946cd0f9b027a4b0
 DIST shared-mime-info-2.1.tar.xz 5202496 BLAKE2B e8dfc7efe78feb5a38c8115a2b332f46c3dac2f89dffad0834fa7b77560b3ef528e779ab9e42822288f85d8c434fd590859db682f3f99494aa6a4387c985e912 SHA512 87e308281e83c4cf889594f7c2e8dcb4d0d0d3910124c3816fdb886ba7d6113b2581711adcb17032b47f9b8d8b7001fab58daa52b7da7c0ef87915e341d6f1b0
 DIST shared-mime-info-2.2.tar.gz 7064139 BLAKE2B 5e791893a60d64a8a1d421c1fabb5e214c6e34ae975d232a9d695b998e8e9aafb6449e858fd845feb120e170bf7c77f70c1fc23e3d4cf8e7c49c6e92418cab96 SHA512 490d96daf4214ab6ac537761b67f3ff4716b95d7ea3fedd2e2ab7b0b02d946acad49790a25efcb5e949551dc4c39ba08911e59f06b198b61dcb1bc44799a2b2e
+DIST shared-mime-info-2.3.tar.bz2 6643480 BLAKE2B 2a3adc0568d1be5a17e5a1533f3c4620c6f9d97069ad9e0a0b26ac241c7b14f7d3b9200534df7e1c2295a561d5e049ce8edf8a1e96d2f4e2040508545172a351 SHA512 f1959933e93373ee6939b289d0c3c35d527ce6803865558e4a8bcb5a0183df2fc1148bbf58bfe9a97342e7125f2e0e39ac5dd3bae998510396d9b6c96a330762
+DIST xdgmime-179296748e92bd91bf531656632a1056307fb7b7.tar.bz2 28123 BLAKE2B ea107dba0819027e4a0a486db00e76f50a4e32e8e84f366b81490e213456e2c7e1c4a92cc4f92173dd6f94f257455bdcb77e3eb7d0ce8fb699c948d2d5b01f0d SHA512 efccff2672efb3ff0e44e83cfbaf6e2b926146e4a9d6132b14e2d7a88d602af340b3948793306ce5f720ac8b09e5d37d3b356a0cc269e8240b382558c9a3cf10
 DIST xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.gz 32703 BLAKE2B 865ff57c566b60fb2bd6cb37e259800ee72fb4b9f2d135db46e9a40206946677a7b50bfb8f13d9ce1493bac972e8a5230d7caa833733f3a8d8631e844a648436 SHA512 90abe20483d5ae2131d18740fffbc57c94470be99e9ea1b04e13bffaf3dda4aa9145cb92bb4defe0a655c0bdbd630aaa325e7a9095b9599faebb751699b9cdd8
 EBUILD shared-mime-info-2.1.ebuild 1260 BLAKE2B 5041b205fd7c83f024fe47af09c9d3312aca1d13f9729be402d6778448dbccdd7723574f2d80c91f7cef61407b5a8bd15b13771943785c45b7c68be0af02c9df SHA512 49a6ee43193657b7a98dfd2b9e27ce80557e14f49c1dfdcc28b1c4ed8c8b35865f2e3d1029f76032923d06b81d98d301a90ae2cad0092bdd50b70f75ce77002a
 EBUILD shared-mime-info-2.2.ebuild 2590 BLAKE2B 53f29bbfbe47f5304f75cfd3b48b111eb95c58c02a10ee6683c678be82f89ca713242d5863f46988020e93587b060a6acdec11ff44699eb4a1df95b86b42adb2 SHA512 f47451d4bf4adb1cb5c07f4c46cdb89cc9d429f112207a8b7dc322f7631eb46957eecd79c7fe1ab49f877afffd9d558a412d6dbf220f06da8a99c9d95cd80e0c
-MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
+EBUILD shared-mime-info-2.3.ebuild 2680 BLAKE2B 5a94b911ae679aca8c7d9ead5c8a43347406fb94d0902c62912189d3241b7e726779fb15ce5634f7b5885040f9c582fe746f99b909426e1645663b52b3533694 SHA512 ea339bc3fac97c73fc5099ac99df6a0148366d2fe9b50c309d735c2a92ad976a6401f4a0daf249fc27727e8e66f4245b6615e1ef4c48b1b946b05a7bbc3409eb
+MISC metadata.xml 326 BLAKE2B f1dab1cfd169c5cb1be051aafeff74601494801bf89257f2727ebfc7999392bfc4dbb94af165a52f045ea4b7d9b178ae8f658123f4d9ec22aae50f9e4470845e SHA512 0c0d4f09ec5bcbbc9bb592c4676761524ce38094d62a2da3dfb1618e9ef933a599770e78fe5a94e0f9c5b7b295742fb39c2484cd07f641fd041aa68fe41b38c8
diff --git a/x11-misc/shared-mime-info/metadata.xml b/x11-misc/shared-mime-info/metadata.xml
index d4390c2eb58e..b133711a480e 100644
--- a/x11-misc/shared-mime-info/metadata.xml
+++ b/x11-misc/shared-mime-info/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">xdg/shared-mime-info</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/shared-mime-info/shared-mime-info-2.3.ebuild b/x11-misc/shared-mime-info/shared-mime-info-2.3.ebuild
new file mode 100644
index 000000000000..82a520646c8e
--- /dev/null
+++ b/x11-misc/shared-mime-info/shared-mime-info-2.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils
+
+# xdgmime is used for tests but doesn't make releases nowadays; do what
+# Fedora does and use a snapshot so we can run the test suite.
+MY_XDGMIME_COMMIT="179296748e92bd91bf531656632a1056307fb7b7"
+DESCRIPTION="The Shared MIME-info Database specification"
+HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
+SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.bz2"
+SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( HACKING.md NEWS README.md )
+
+src_prepare() {
+	default
+
+	if use test ; then
+		# Drop empty dir (it's a submodule in upstream git repo)
+		rm -r "${S}"/xdgmime || die
+		# Lead Meson to our snapshot
+		mkdir "${WORKDIR}"/xdgmime_build || die
+		ln -s "${WORKDIR}"/xdgmime_build xdgmime || die
+		# Don't break parallel make
+		#sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die
+	fi
+}
+
+src_configure() {
+	# We have to trick Meson into thinking it's there now so that
+	# we can run meson then emake to build xdgmime later, rather than
+	# building before running meson which would mean doing something
+	# unexpected in src_configure.
+	if use test ; then
+		# Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29
+		mkdir xdgmime/src || die
+		touch xdgmime/src/{print,test}-mime{,-data} || die
+		chmod +x xdgmime/src/{print,test}-mime{,-data} || die
+
+		BUILD_DIR="${WORKDIR}"/xdgmime_build EMESON_SOURCE="${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} meson_src_configure
+	fi
+
+	local emesonargs=(
+		-Dbuild-tools=true
+		-Dupdate-mimedb=false
+		$(meson_use test build-tests)
+	)
+
+	meson_src_configure
+}
+
+src_compile() {
+	if use test ; then
+		meson_src_compile -C "${WORKDIR}"/xdgmime_build
+	fi
+
+	meson_src_compile
+}
+
+src_install() {
+	meson_src_install
+
+	# in prefix, install an env.d entry such that prefix patch is used/added
+	if use prefix; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
+		doenvd "${T}"/50mimeinfo
+	fi
+}
+
+pkg_postinst() {
+	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	xdg_mimeinfo_database_update
+}