From cba6641bde95486e28da7a952647e0fb003f913a Mon Sep 17 00:00:00 2001 From: Torsten Kurbad Date: Mon, 6 Oct 2025 22:22:09 +0200 Subject: [PATCH] Volkszeahler Update (WIP) --- dev-php/composer/Manifest | 3 + dev-php/composer/composer-2.8.12.ebuild | 62 +++++++++++++++++++ dev-php/composer/metadata.xml | 15 +++++ www-apps/volkszaehler/Manifest | 2 +- .../volkszaehler/volkszaehler-9999.ebuild | 12 ++-- 5 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 dev-php/composer/Manifest create mode 100644 dev-php/composer/composer-2.8.12.ebuild create mode 100644 dev-php/composer/metadata.xml diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest new file mode 100644 index 0000000..b05e65c --- /dev/null +++ b/dev-php/composer/Manifest @@ -0,0 +1,3 @@ +DIST composer-2.8.12-vendor.tar.xz 3154644 BLAKE2B c7e00af4e31b143d391381b85ff31cb1e5f19b0d4af0b2c974f7ebb47dc612a2d4778e449fb8f5fa33853b4450d83306cf70dd017c86bfd6e4e450a3a16847f5 SHA512 69ab78439795e0f5b6e376afadf95d3780be33adba34479c5cc12c45215c186a4603d34a890b306275215292a213b8487cfaa6668f2a036e3ee504f2940bafaa +EBUILD composer-2.8.12.ebuild 1560 BLAKE2B 032e36122468aecac02ac13414fe38da3a62165a0991217d03057e4bf31f7c55b3a4123e3afa81baea66b78b08678a835467cf067eab3085765a5ae8ecde2c7b SHA512 21362d1c62cb07e57e6e578a6bca40ef50545c242a60f3a82ce4a50e462a82d4ca5f0cfee3ce24165d6a95ff989dd3338cf72cf33c3c3e98abdb969dbb61ce51 +MISC metadata.xml 480 BLAKE2B c5561d06c257a47599759e704886a877d72d299c2831d695b51ca7a490014060db77345d76157bfb0342d132d3795002ccd0add2d153ffd0eb2357e7577758de SHA512 0138f952cffe57b904577199288b511bf37a7e60bc9933b09ec94ae71fe0e4dc72633ef6a9f90fc8b15b14deda3073de552fee88137779d73ceec08cf6b7090c diff --git a/dev-php/composer/composer-2.8.12.ebuild b/dev-php/composer/composer-2.8.12.ebuild new file mode 100644 index 0000000..76401d5 --- /dev/null +++ b/dev-php/composer/composer-2.8.12.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 git-r3 + +DESCRIPTION="Dependency Manager for PHP" +HOMEPAGE="https://github.com/composer/composer" +SRC_URI="https://raw.githubusercontent.com/inode64/inode64-overlay/main/dist/${P}-vendor.tar.xz" + +EGIT_REPO_URI="https://github.com/${PN}/${PN}" +EGIT_COMMIT="8413f50f097774e0601400e5599b5f38866fa3f4" +EGIT_BRANCH="2.8" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="doc" +DOCS="CHANGELOG.md README.md" + +src_unpack() { + git-r3_src_unpack + unpack ${P}-vendor.tar.xz +} + +src_compile() { + php --define memory_limit=-1 -d phar.readonly=Off bin/compile || die + mv composer.phar composer + chmod +x composer + ./composer completion bash > completion.bash || die +} + +src_test() { + if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then + ewarn "Some tests may fail with FEATURES=usersandbox or" + ewarn "FEATURES=network-sandbox; Skipping tests because" + ewarn "test suite would hang forever in such environments!" + return 0; + fi + + mkdir integration-test + cd integration-test + + ../composer init \ + --no-interaction \ + --type=project \ + --name='gentoo/test' \ + --description='Composer Test Project' \ + --license='GPL-3.0-or-later' \ + --require='symfony/console:*' || die + ../composer update --no-interaction --no-progress --prefer-dist || die + ../composer validate --no-interaction || die +} + +src_install() { + dobin "${PN}" + newbashcomp completion.bash composer + if use doc; then + dodoc -r doc + fi +} diff --git a/dev-php/composer/metadata.xml b/dev-php/composer/metadata.xml new file mode 100644 index 0000000..7bc7c2e --- /dev/null +++ b/dev-php/composer/metadata.xml @@ -0,0 +1,15 @@ + + + + + web@inode64.com + Fco. Javier Félix + + + proxy-maint@gentoo.org + Proxy Maintainers + + + composer/composer + + diff --git a/www-apps/volkszaehler/Manifest b/www-apps/volkszaehler/Manifest index 26f0901..a6eacb2 100644 --- a/www-apps/volkszaehler/Manifest +++ b/www-apps/volkszaehler/Manifest @@ -1,2 +1,2 @@ -EBUILD volkszaehler-9999.ebuild 2760 BLAKE2B 53375e3274d6947a1cc940ca9aee477576b8cb4129639d0a22da4f99dd3332a7dfddae6e2f793c387f5b641121a9bd8ec421e9c52856d23c15c9b04548e6449c SHA512 52d589a231b8824b75941fd757de39e00a9bc0f31b764257b88ab954a020d5c9817f537c0188ea15ae66ceb5c71137a8194fe9dd2999f55b7d60a0e2846f3f56 +EBUILD volkszaehler-9999.ebuild 2704 BLAKE2B 1b1b86d6cda306eedf3983bc78dc827edf48b2c267cbe8ee33fd69e1d846ab7d93f75803e08004241ec12191af073641fc7a60b697687559021596580711b4df SHA512 53a2bb62244eb223ad5883f7437b080ec70ca727e9edabb0b09239596f1d74c94256167891e0eb70a021a999e533e96bcc430240571dbf359395415cbd34b9f9 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33 diff --git a/www-apps/volkszaehler/volkszaehler-9999.ebuild b/www-apps/volkszaehler/volkszaehler-9999.ebuild index 6e29f5f..d1ef04c 100644 --- a/www-apps/volkszaehler/volkszaehler-9999.ebuild +++ b/www-apps/volkszaehler/volkszaehler-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit webapp @@ -48,16 +48,16 @@ src_compile() { src_install() { webapp_src_preinst - local docs="LICENSE README.md bin/README.md misc/controller/README" + local docs="LICENSE README.md bin/README.md" dodoc ${docs} rm -rf ${docs} insinto "${MY_HTDOCSDIR}" doins -r . - webapp_configfile "${MY_HTDOCSDIR}"/etc/volkszaehler.conf.template.php + webapp_configfile "${MY_HTDOCSDIR}"/etc/config.dist.yaml webapp_configfile "${MY_HTDOCSDIR}"/etc/middleware.json - webapp_configfile "${MY_HTDOCSDIR}"/etc/dbcopy.json + webapp_configfile "${MY_HTDOCSDIR}"/etc/dbcopy.dist.yaml webapp_src_install } @@ -80,8 +80,8 @@ pkg_postinst() { echo " FLUSH PRIVILEGES;" echo " QUIT;" echo - echo " cp -a /var/www/localhost/htdocs/${PN}/etc/volkszaehler.conf.template.php \\" - echo " /var/www/localhost/htdocs/${PN}/etc/volkszaehler.conf.php" + echo " cp -a /var/www/localhost/htdocs/${PN}/etc/config.dist.yaml \\" + echo " /var/www/localhost/htdocs/${PN}/etc/config.yaml" echo " sed \"s/\([[:space:]+]\)= 'vz';/\1= 'volkszaehler';/\" \\" echo " -i /var/www/localhost/htdocs/${PN}/etc/volkszaehler.conf.php"; echo " sed \"s/\([[:space:]+]\)= 'demo';/\1= '$PASSWORD';/\" \\"