From a407e25d814596ca802d83102671d95e00079767 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 31 May 2023 15:23:38 +0100 Subject: gentoo auto-resync : 31:05:2023 - 15:23:38 --- media-sound/Manifest.gz | Bin 57062 -> 57069 bytes media-sound/audacious/Manifest | 2 +- media-sound/audacious/audacious-4.3.1.ebuild | 2 +- media-sound/mixxx/Manifest | 2 +- media-sound/mixxx/mixxx-2.3.5-r1.ebuild | 2 +- media-sound/upmpdcli/Manifest | 4 +- media-sound/upmpdcli/upmpdcli-1.7.2-r1.ebuild | 68 ++++++++++++++++++++++++++ media-sound/upmpdcli/upmpdcli-1.7.2.ebuild | 68 -------------------------- media-sound/upmpdcli/upmpdcli-1.7.9-r1.ebuild | 68 ++++++++++++++++++++++++++ media-sound/upmpdcli/upmpdcli-1.7.9.ebuild | 68 -------------------------- 10 files changed, 142 insertions(+), 142 deletions(-) create mode 100644 media-sound/upmpdcli/upmpdcli-1.7.2-r1.ebuild delete mode 100644 media-sound/upmpdcli/upmpdcli-1.7.2.ebuild create mode 100644 media-sound/upmpdcli/upmpdcli-1.7.9-r1.ebuild delete mode 100644 media-sound/upmpdcli/upmpdcli-1.7.9.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 9c67b3f737ae..2c9b301175a5 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest index 70b484865bed..0e71c4df37dd 100644 --- a/media-sound/audacious/Manifest +++ b/media-sound/audacious/Manifest @@ -1,6 +1,6 @@ DIST audacious-4.3.1.tar.bz2 630820 BLAKE2B e8885d25cce4a480ac58c5ee1874a530f4b169f264eaafb13830be17ce7e25933a2fb491ed0b86220fdb2e916ea5d7b13bca8a5ac00695ffd06e1ad8b2a6ff67 SHA512 7662a1b136c6ced346ce160a3a6b71ea5941644860466e23248a44168179118202006e8892a5bbd1f6d77730846a4644b6cb4e008af38e1117588b9f4d1521f5 DIST audacious-4.3.tar.bz2 623855 BLAKE2B a00d5f4fafff6eec5aba0374ba41b0521e60814421845d4cad284bb12bc67623d27d2101f5ba3c72bf7ab68d7f53f3c5473fd173bd929c35de51c4d2ff3ccde0 SHA512 7e92739ffd6adb62c6efe11b3107fc6d2d45ba5bbb6375dddd227f4c51387e0bbca2a5c1020b25a97933b9f02d3e726b22a21f7566ffac8b08ddfad609c3dc0e DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05 -EBUILD audacious-4.3.1.ebuild 1465 BLAKE2B 765820b8beb8b46ef8959c38533ec5d57767fd98be20e7501b1f3aea095300b7c730e7f72f9dd0b282c11a00ef131ca2c154e4f8b0458a90f4678ecc8e7b244f SHA512 da1d49896627d57eabbe3a3b5c0323c79c22987cecb60093e3307cd95dc4ad3806e07ed310ffe4bca6e1040181f60e925faa8d79f9cc070d7778c6ae32c29fd0 +EBUILD audacious-4.3.1.ebuild 1463 BLAKE2B e93837cf90dda9a6d6c9410271b6c53144bf6b7a3a298debec30774fa8f7db5de9da98b4c97b2cd7cdd9a3ac563ebd529bf441af2f9568e26f6c6523af195599 SHA512 4d1ad0d2b421a1d84db6f0eb949ff35b5a88f02173218dd8e3cfdfd8ae7f4cb9235752d8bb6a15efdddff62cb6ac7ce1cedc5d070ad2d607e42a5b9fd76d8ebc EBUILD audacious-4.3.ebuild 1463 BLAKE2B e93837cf90dda9a6d6c9410271b6c53144bf6b7a3a298debec30774fa8f7db5de9da98b4c97b2cd7cdd9a3ac563ebd529bf441af2f9568e26f6c6523af195599 SHA512 4d1ad0d2b421a1d84db6f0eb949ff35b5a88f02173218dd8e3cfdfd8ae7f4cb9235752d8bb6a15efdddff62cb6ac7ce1cedc5d070ad2d607e42a5b9fd76d8ebc MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b diff --git a/media-sound/audacious/audacious-4.3.1.ebuild b/media-sound/audacious/audacious-4.3.1.ebuild index eb7bae84d68a..ee999ce83200 100644 --- a/media-sound/audacious/audacious-4.3.1.ebuild +++ b/media-sound/audacious/audacious-4.3.1.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://audacious-media-player.org/" SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2" SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv x86" LICENSE="BSD-2" SLOT="0" IUSE="nls" diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest index 80be33f20fdd..24a977d5011a 100644 --- a/media-sound/mixxx/Manifest +++ b/media-sound/mixxx/Manifest @@ -28,7 +28,7 @@ DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0 DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f EBUILD mixxx-2.3.3-r1.ebuild 3857 BLAKE2B bcb72472fb83ecbfcc8e1552adcb6e52cfe6406c5b430a14b564b48a4119e64f6180bc6e029abfc0fc1190235ad1c43558143b46f78319121770a23c3760220f SHA512 195025c6f4e47db5557a487eae23a629049cae97f4c299d1b86c106fd5b79c140951f5669ef9416261ccb2546962f3e662a12078cf180dbf154b388db30a4a5f -EBUILD mixxx-2.3.5-r1.ebuild 3784 BLAKE2B 7add5a5f2a60a48eba68d066f582ff95326e4822c01d6786733454e4a0ec302a067a93a866187784658ae96aaef095faced016ac1101564dd5159e052c2abe04 SHA512 808a20dc82b043a7d12412c937e29c15124f4382d3cec557c910c9fe7f3b054519c6793157c170674c9051aeecc421367a33229efc9ecf661bd64c8875e8b3b7 +EBUILD mixxx-2.3.5-r1.ebuild 3783 BLAKE2B 90eeb82eeaafeb343f0990c5cb4594fa38e9c379752c8824cd4ad8865736a59dfbb031faa0425bd46dbbb1bef9bc96960ae3eec3ee56451aeda12098f29ff6b6 SHA512 6041d91c6542395d1d71dd15792da0e1f41edd71279de6f21ff3a0e94d39d82eb780ff18e1857bc6c0eff42a00dbe902762a0ebeb34e34ea6faa70e39c681240 EBUILD mixxx-2.3.9999.ebuild 3689 BLAKE2B 6d0d2c6a01fe390b5958753f873b995b39492af1a43e32b4c01809da10aa7b9901edd049a4df1ec260edb72071d9ba22d419646b002e39a27d76f8dcd95f84d3 SHA512 f997798193f953f84ee198e6e9052d5e2ddd2cb31f08b3bf527ea371e4af291a240e2ae457473ce27bde6075361f4711f340ed842edfb61104e2e63024fb870c EBUILD mixxx-9999.ebuild 2829 BLAKE2B f21165282b08bcd40f3a345bf523c3881efc1268634a2a2f19fa387ad946d447f94c2f22300d5ecb2c553461d1b93edcc2e879962cd83bff9da73cb264664cf0 SHA512 eb55e944cda6a0eff9416415c84cff5e1ad6d35b808b19699e852740587f4020f44b1978236e14254cb8e66bfcede63c88e0eb69b611afdb67932886167c1221 MISC metadata.xml 903 BLAKE2B 1fd2e01da4d96a257d0ba595e67005e5233503f54ea17c81f65d105a61dc42f84df601cc112ff0a5e99393cbc53a0130b890d96a47cc2b88b59cbe7b9779654d SHA512 7e9dfd69240a57efbdaceb4dcfe71549d7a8c2edba5c81f956407e101cb62a0c51cf231e1e68c029783340189139309dde4fa3e995a231856ea094df09288cd8 diff --git a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild index c95ad499da23..4481a0c531b5 100644 --- a/media-sound/mixxx/mixxx-2.3.5-r1.ebuild +++ b/media-sound/mixxx/mixxx-2.3.5-r1.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then else SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" #S="${WORKDIR}/${PN}-release-${PV}" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="GPL-2" SLOT="0" diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest index 2bef7911c905..ef9664e6c6a6 100644 --- a/media-sound/upmpdcli/Manifest +++ b/media-sound/upmpdcli/Manifest @@ -3,6 +3,6 @@ AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f DIST upmpdcli-1.7.2.tar.gz 604605 BLAKE2B c5b5493d4ef9f13d6311b36927c3a97b77fee01a683d6af30ee317c67cbb3370e4743f8e59936d5e1f0e3961eff14dbb52b15fb5b54cf9d95ce98ad32487df6b SHA512 ab95f04d56925665d644e60532907f943a14dbf4cf760b1149ea071029077809e2d24e58ed41deee26b780d7cc53bad9815f3923c65e682f133d775c0608f0c5 DIST upmpdcli-1.7.9.tar.gz 612647 BLAKE2B 8234dc1872482eb8d53419b8fe02b5d87e9833eb436089b198a7d18402573d48facfcb42d65847b013d462905cdd556203fbaf91f3947a3b87ceee0b0ebd4edf SHA512 0432d32e96d7f9ae0700030fd5c9d35730e1004a995eaebba2a25e0564627c4fe62d23d7f933c2c0e54d8a70b6378cfde0ed903b7be695d468db8eeb9a33e907 -EBUILD upmpdcli-1.7.2.ebuild 1422 BLAKE2B bef2466e9756558133dffa6fcb0e23efd7fe5f7e11a783a71997d4e0272636b937d9df5fe5282a3fe635673d971aee5e3d45567b7ca8ed564b46e18e445c015c SHA512 d2d4a0858c2938b3892c77ebd343eae84dcfa7cdacdcb2d1cf018cf6cb9a457b49c282cf8f23007cad4bb3b9a319088b59a7e62a2b37d51de595cade098e1f38 -EBUILD upmpdcli-1.7.9.ebuild 1424 BLAKE2B eb8561c617618c7b7c2ce37e2602cdb0bacbf683d11b70172fdfa2f29ae71f08aa953eab4f60dc7565ca96d75e613c8c95d09ead7d6924125398f5076f03210a SHA512 56f9545e7f8b0009ead5c18650a4bed8d40761c9402714f49793f2bef34d91cbff005bc7fe08a89eca463278882f6380977aefefda44f6f345f0c0e342a306df +EBUILD upmpdcli-1.7.2-r1.ebuild 1424 BLAKE2B cccf4174bcb82316fd96a8c9bfbb88e99224ca7d13d860284ebd42c91a7bf179b505633e506b2b1129c08b14cbe4ae4d1b21aa39e106c2cc028c63c02ffe2775 SHA512 11e06f4d5bee225238e656e10120bd8b5adfbeaf4285a7b0119819668475352316cf86c67679e60b3cfb200f9ddce90f8da54b101c4762f954247d83b9233dc2 +EBUILD upmpdcli-1.7.9-r1.ebuild 1426 BLAKE2B 5cf1f8d7e02f12865787d6dfbcf771ee350ca5fe256ad857d2adfec54223fdc67b8dbd2d1786c65dbd1bb88077e8fc9f24025698bd9eaf0d6d1bcaa74f72b58c SHA512 72f6ebe7ffd77309b4e38f3924e8918650461337b13136c6222833650021f7b78b003be3772220c48bf7c4c2e236a1224d4930bd57e8cc712a3e778045a4a35f MISC metadata.xml 324 BLAKE2B 53acf2369d1e3957218ea3634ed2fe10034b9d74109af9df7acfcf29a37697ade6488aefc5df3503754833b0f6dc5df777feb945355f633fa6e1a3ade8b13adf SHA512 871929dc11894dc91b3257a5e9e8f5164e3f5e1af0dce2cc7571dd106cc70bd777562bb56913ca45f3bf1cf0316938f7f2c0a8386bdcf408c0f834385db4d45d diff --git a/media-sound/upmpdcli/upmpdcli-1.7.2-r1.ebuild b/media-sound/upmpdcli/upmpdcli-1.7.2-r1.ebuild new file mode 100644 index 000000000000..83569f8de8c1 --- /dev/null +++ b/media-sound/upmpdcli/upmpdcli-1.7.2-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon" +HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html" +LICENSE="GPL-2" + +SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="thirdparty" + +DEPEND=" + dev-libs/jsoncpp + media-libs/libmpdclient + net-libs/libmicrohttpd:= + net-libs/libupnpp +" +RDEPEND=" + ${DEPEND} + acct-group/upmpdcli + acct-user/upmpdcli + app-misc/recoll + thirdparty? ( dev-python/requests ) +" + +PATCHES=( + "${FILESDIR}"/makefile.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --disable-dependency-tracking \ + --disable-silent-rules \ + "--docdir=/usr/share/doc/${P}" \ + "--htmldir=/usr/share/doc/${P}/html" \ + --libdir=/usr/lib64 \ + || die "Configure failed" + +} + +src_install() { + default + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + systemd_dounit systemd/upmpdcli.service +} + +pkg_postinst() { + einfo + einfo "This package no longer assumes that upmpdcli is driving an" + einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)." + einfo "Probably it is though, so be sure your mpd is built with" + einfo "USE=curl." +} diff --git a/media-sound/upmpdcli/upmpdcli-1.7.2.ebuild b/media-sound/upmpdcli/upmpdcli-1.7.2.ebuild deleted file mode 100644 index 6f8f00af7075..000000000000 --- a/media-sound/upmpdcli/upmpdcli-1.7.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd - -DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon" -HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html" -LICENSE="GPL-2" - -SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="thirdparty" - -DEPEND=" - dev-libs/jsoncpp - media-libs/libmpdclient - net-libs/libmicrohttpd - net-libs/libupnpp -" -RDEPEND=" - ${DEPEND} - acct-group/upmpdcli - acct-user/upmpdcli - app-misc/recoll - thirdparty? ( dev-python/requests ) -" - -PATCHES=( - "${FILESDIR}"/makefile.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --disable-dependency-tracking \ - --disable-silent-rules \ - "--docdir=/usr/share/doc/${P}" \ - "--htmldir=/usr/share/doc/${P}/html" \ - --libdir=/usr/lib64 \ - || die "Configure failed" - -} - -src_install() { - default - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - systemd_dounit systemd/upmpdcli.service -} - -pkg_postinst() { - einfo - einfo "This package no longer assumes that upmpdcli is driving an" - einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)." - einfo "Probably it is though, so be sure your mpd is built with" - einfo "USE=curl." -} diff --git a/media-sound/upmpdcli/upmpdcli-1.7.9-r1.ebuild b/media-sound/upmpdcli/upmpdcli-1.7.9-r1.ebuild new file mode 100644 index 000000000000..c38f8d283050 --- /dev/null +++ b/media-sound/upmpdcli/upmpdcli-1.7.9-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon" +HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html" +LICENSE="GPL-2" + +SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="thirdparty" + +DEPEND=" + dev-libs/jsoncpp + media-libs/libmpdclient + net-libs/libmicrohttpd:= + net-libs/libupnpp +" +RDEPEND=" + ${DEPEND} + acct-group/upmpdcli + acct-user/upmpdcli + app-misc/recoll + thirdparty? ( dev-python/requests ) +" + +PATCHES=( + "${FILESDIR}"/makefile.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --disable-dependency-tracking \ + --disable-silent-rules \ + "--docdir=/usr/share/doc/${P}" \ + "--htmldir=/usr/share/doc/${P}/html" \ + --libdir=/usr/lib64 \ + || die "Configure failed" + +} + +src_install() { + default + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + systemd_dounit systemd/upmpdcli.service +} + +pkg_postinst() { + einfo + einfo "This package no longer assumes that upmpdcli is driving an" + einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)." + einfo "Probably it is though, so be sure your mpd is built with" + einfo "USE=curl." +} diff --git a/media-sound/upmpdcli/upmpdcli-1.7.9.ebuild b/media-sound/upmpdcli/upmpdcli-1.7.9.ebuild deleted file mode 100644 index d25f68706433..000000000000 --- a/media-sound/upmpdcli/upmpdcli-1.7.9.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools systemd - -DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon" -HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html" -LICENSE="GPL-2" - -SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="thirdparty" - -DEPEND=" - dev-libs/jsoncpp - media-libs/libmpdclient - net-libs/libmicrohttpd - net-libs/libupnpp -" -RDEPEND=" - ${DEPEND} - acct-group/upmpdcli - acct-user/upmpdcli - app-misc/recoll - thirdparty? ( dev-python/requests ) -" - -PATCHES=( - "${FILESDIR}"/makefile.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --disable-dependency-tracking \ - --disable-silent-rules \ - "--docdir=/usr/share/doc/${P}" \ - "--htmldir=/usr/share/doc/${P}/html" \ - --libdir=/usr/lib64 \ - || die "Configure failed" - -} - -src_install() { - default - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - systemd_dounit systemd/upmpdcli.service -} - -pkg_postinst() { - einfo - einfo "This package no longer assumes that upmpdcli is driving an" - einfo "mpd instance on the same host (https://bugs.gentoo.org/670130)." - einfo "Probably it is though, so be sure your mpd is built with" - einfo "USE=curl." -} -- cgit v1.2.3