diff --git a/www-apps/pleroma/Manifest b/www-apps/pleroma/Manifest index 6f43d4273..6eeac4590 100644 --- a/www-apps/pleroma/Manifest +++ b/www-apps/pleroma/Manifest @@ -1,15 +1,13 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST pleroma-0.9.9.tar.bz2 29447938 BLAKE2B 94092b3583043a7737511959610ee81b4525a9b7f77a7743ec865adcb0f44c1287f10f07b6da8529113aa0f7f0533d9aae425aba295a560ca7523ddbf1c23aec SHA512 48df04a20d2891c9ace26bafac7e3ee07abd6b7d189e1b6bdd85143188745262995c56030c38d22c8125ee78a691bdf5b0e8eb8d8065fe9ff94a73e0638d4955 -DIST pleroma-0.9.99.tar.bz2 29584495 BLAKE2B 8286a4442a95c70c57eb91a9deb4504ee9a19575137f0008c02d5e5d952e56f0ac1bcd8821961cb351142242024f4e6d10ae3341967d096c4df657377e8cce59 SHA512 7e8ad23c57a9900d4dd0a83dc099e6d292699dd7300bf36188e893a91dac9532bdbe333556cd6016c0f3525e1aea3632c715ff11e6ec24cabcc8df51e1974049 -EBUILD pleroma-0.9.9-r2.ebuild 4260 BLAKE2B 506461b39c06a41485fb3ef88e8ccb18f09fb237d83f7d5ada2828e8ac4924b8b5e7c025e9aa1d890e9d0d910317bbd311074340613624edf7b7cb3c3fc04706 SHA512 9346555b5de2c3b1d1ecec037078c5c3acfee40183d829c25b514b8e64e5b7fe3b36d44f4dbe488984fa40675edd9151e9fb04761894b0a3dbb3d0fe0438905e -EBUILD pleroma-0.9.99.ebuild 4451 BLAKE2B 6f43cf3207aaceb208e07ec5e0e8a7d9aa9e1cdbb20ab296a776dc87a33b5697802c9a38f0c385d792de989b3fe85a8da433c1219e7ef9df3c4898015fb8671a SHA512 aec71a51ab5549c21a6c2cdc5a0b1cffdc1be4dcaa196f0f63844583395f248e147e82191590d6e4e3247690fb83e0748716c4d6274600b167277a60854f5077 +DIST pleroma-0.9.9999.tar.bz2 29590056 BLAKE2B 5df648388e87c8dc57158fc98bd67a0c747537f2c12abf3d3fcae7dfd20fcf147f19fb107c64172ea587ac16ae76b557fcb4cb5011d3f656734f11952adea1d7 SHA512 ea6de8a109be0fe09a200c480ba908b114b981694443ee7d188c6104cf9183e14346fd58848cc808ae2a0d1ebc64faafb9b3ffbc6e8bf430976d0c971a14ef6b +EBUILD pleroma-0.9.9999.ebuild 4441 BLAKE2B 300c7c9ef10bad489d62ece781c54e793d1bdb2b3028505ee2dba2f660c4211d4f143d4a0d4fe3aae1498c18dd19fb5a3bd96eb8c6bde6f7133bf65c2bdda309 SHA512 602c8c6e552e3e65aec90f18dd787a54729a50a69aa39655c0f92106b1a438db96b80e461c9ecf697f43cf5df2ec32ac958f2da69eb08ee0b94d32c8d8885f07 MISC metadata.xml 993 BLAKE2B adc5c72fe12b6fdb4eb20c1d79dde227b088b437ffd21d16cc5775fa5bb7fa6363890dd5017fbe7f5a00a794a38fb298ce17e6402f6d3d5441985effd0d7e1db SHA512 6ff23fa60c0f22ef7a433e3d1b4919d074508898504b7168c925da8840f542afcdc891a9f4df69dc8eb6c44b7d9c41e6b94fdecd404ca738169124bcdab0af0d -----BEGIN PGP SIGNATURE----- -iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXJ+G9AAKCRDPw5SX8bJu -B19OAP9jwVxvAXLJvcscrozNp0xbXflI7cpq7VauMyuNA99KVAD/c30zHirOyiB+ -HbfvM1h/26YW2IQnpVyjlSXwe5tIMp4= -=EA+B +iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXKzPcgAKCRDPw5SX8bJu +B/jXAP9EnmSx5Y8dv67hTfvuMJ4O1jiMkeTu9jfthvV/oBEfowD6As+UjbVq6q2p +x3Xr8s844Btudxe9XxRhWT91Uf/WD4M= +=32CR -----END PGP SIGNATURE----- diff --git a/www-apps/pleroma/pleroma-0.9.9-r2.ebuild b/www-apps/pleroma/pleroma-0.9.9-r2.ebuild deleted file mode 100644 index 37cec8379..000000000 --- a/www-apps/pleroma/pleroma-0.9.9-r2.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user systemd - -MY_P="${PN}-v${PV}" -DESCRIPTION="Microblogging server software that can federate with other servers." -HOMEPAGE="https://pleroma.social/ https://git.pleroma.social/pleroma/pleroma/" -SRC_URI="https://git.pleroma.social/pleroma/pleroma/-/archive/v${PV}/${MY_P}.tar.bz2 - -> ${P}.tar.bz2" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="" -IUSE="apache +nginx syslog" - -RDEPEND=" - >=dev-lang/elixir-1.6.6 - >=dev-db/postgresql-9.6.11[uuid] - apache? ( www-servers/apache ) - nginx? ( www-servers/nginx ) -" -DEPEND="" - -S="${WORKDIR}/${MY_P}" - -pkg_preinst() { - elog "This ebuild comes with a lot of bundles libraries." - - # Backup user-modified files - if [ -f "${EROOT}/opt/pleroma/priv/static/instance/panel.html" ]; then - einfo "Backing up panel.html, terms-of-service.html and thumbnail.jpeg ..." - mv "${EROOT}/opt/pleroma/priv/static/instance/panel.html"{,~} || die - mv "${EROOT}/opt/pleroma/priv/static/static/terms-of-service.html"{,~} || die - mv "${EROOT}/opt/pleroma/priv/static/instance/thumbnail.jpeg"{,~} || die - fi - - ewarn "This ebuild may overwrite files you have edited. Waiting 10 seconds ..." - sleep 10 || die -} - -pkg_setup() { - enewgroup pleroma - enewuser pleroma -1 -1 /opt/pleroma pleroma -} - -src_prepare() { - default - - sed -i 's|directory=~pleroma/pleroma|directory=~pleroma|' \ - "${S}/installation/init.d/pleroma" || die -} - -src_install() { - local pleromadir="${EPREFIX}/opt/pleroma" - - insopts -o pleroma -g pleroma -m 664 - insinto "${pleromadir}" - doins -r * .* - - if use nginx; then - dodoc installation/pleroma.nginx - fi - if use apache; then - dodoc installation/pleroma-apache.conf - fi - - dodoc docs/* - - doinitd installation/init.d/pleroma - systemd_dounit installation/pleroma.service -} - -pkg_postinst() { - elog "You need to run emerge --config www-apps/pleroma after each upgrade." - if use nginx; then - einfo "An example config for nginx has been installed in the doc directory." - fi - if use apache; then - einfo "An example config for apache has been installed in the doc directory." - fi - - if ! grep -q MIX_ENV ~pleroma/.profile; then - echo "export MIX_ENV=prod" >> ~pleroma/.profile - fi - - # Restore user-modified files - if [ -f "${EROOT}/opt/pleroma/priv/static/instance/panel.html~" ]; then - einfo "Restoring panel.html, terms-of-service.html and thumbnail.jpeg ..." - mv "${EROOT}/opt/pleroma/priv/static/instance/panel.html"{~,} || die - mv "${EROOT}/opt/pleroma/priv/static/static/terms-of-service.html"{~,} || die - mv "${EROOT}/opt/pleroma/priv/static/instance/thumbnail.jpeg"{~,} || die - fi -} - -pkg_config() { - local configfile="${EROOT}/opt/pleroma/config/prod.secret.exs" - cd "${EROOT}/opt/pleroma" || die - - if [ ! -f ${configfile} ]; then - einfo "Installing the dependencies..." - einfo "Answer with yes if it asks you to install Hex." - su -s /bin/sh -c "mix deps.get" pleroma || die - - einfo "Generating the configuration..." - einfo "Answer with yes if it asks you to install rebar3." - su -s /bin/sh -c "mix pleroma.instance gen" pleroma || die - mv config/{generated_config.exs,prod.secret.exs} || die - - if use syslog; then - echo -e "config :logger,\n backends: [{ExSyslogger, :ex_syslogger}]\n\n" \ - "config :logger, :ex_syslogger,\n level: :warn'" >> ${configfile} - fi - - einfo "Creating the database..." - su -s /bin/sh -c "psql -f config/setup_db.psql" postgres || die - - einfo "Running the database migration..." - su -s /bin/sh -c "MIX_ENV=prod mix ecto.migrate" pleroma || die - - einfo "Your configuration file is in ${configfile}." - else - einfo "Pleroma will be stopped for the duration of the update." - einfo "Hit enter to proceed." - read - - local started=0 - if "${EROOT}"/etc/init.d/pleroma --nocolor status | grep started; then - started=1 - fi - - if [ ${started} -eq 1 ]; then - einfo "Stopping pleroma..." - "${EROOT}"/etc/init.d/pleroma stop || die - fi - - einfo "Updating the dependencies..." - su -s /bin/sh -c "mix deps.get" pleroma || die - - einfo "Running the database migration..." - su -s /bin/sh -c "MIX_ENV=prod mix ecto.migrate" pleroma || die - - if [ ${started} -eq 1 ]; then - einfo "Starting pleroma..." - "${EROOT}"/etc/init.d/pleroma start || die - fi - fi -} diff --git a/www-apps/pleroma/pleroma-0.9.99.ebuild b/www-apps/pleroma/pleroma-0.9.9999.ebuild similarity index 96% rename from www-apps/pleroma/pleroma-0.9.99.ebuild rename to www-apps/pleroma/pleroma-0.9.9999.ebuild index 5f717b12a..8f614bbb3 100644 --- a/www-apps/pleroma/pleroma-0.9.99.ebuild +++ b/www-apps/pleroma/pleroma-0.9.9999.ebuild @@ -17,7 +17,7 @@ KEYWORDS="" IUSE="apache +nginx syslog" RDEPEND=" - >=dev-lang/elixir-1.6.6 + >=dev-lang/elixir-1.7.4 >=dev-db/postgresql-9.6.11[uuid] apache? ( www-servers/apache ) nginx? ( www-servers/nginx ) @@ -27,8 +27,6 @@ DEPEND="" S="${WORKDIR}/${MY_P}" pkg_preinst() { - einfo "This ebuild comes with a lot of bundles libraries." - # Backup user-modified files if [ -f "${EROOT}/opt/pleroma/priv/static/instance/panel.html" ]; then einfo "Backing up panel.html, terms-of-service.html and thumbnail.jpeg ..." @@ -113,8 +111,9 @@ pkg_config() { mv config/{generated_config.exs,prod.secret.exs} || die if use syslog; then + einfo "Activating syslog in ${configfile} ..." echo -e "config :logger,\n backends: [{ExSyslogger, :ex_syslogger}]\n\n" \ - "config :logger, :ex_syslogger,\n level: :warn'" >> ${configfile} + "config :logger, :ex_syslogger,\n level: :warn'" >> ${configfile} fi einfo "Creating the database..."