gentoo auto-resync : 22:08:2022 - 02:42:13

7 files changed, 101 insertions, 177 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 208b9c09348a..ccbf1098dde3 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/gitit/Manifest b/www-apps/gitit/Manifest
deleted file mode 100644
index e0a57e94ed9c..000000000000
--- a/www-apps/gitit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gitit-0.13.0.0-pandoc-2.12.patch 1732 BLAKE2B 46c5c87a9100c4d11ca265e48490c46f1a76dfb22df14dfe92b8d1a0ba1ef33a9598099973469f98654f02ba8248be9b08ff6b3d39aca2b9b4adfe72d1c9ad02 SHA512 38bf99b60d4cbc06f8fb47054531e75120951757e63bd995b1d71d016683ee1523dd2a1bb2fcca35be71362113ff3e52af36b71da9216c94bd467ddce64ace17
-DIST gitit-0.13.0.0.tar.gz 274691 BLAKE2B 74ef7d4a73356a2be7531fa22faf6ebd2f5a2edf9ce40909cff31756d93e1bea8e563d953b6c3fe0ea30fa98d13dee21aa7331bbb281fcfd476b2de90cd0accb SHA512 dce06c73813a71df4e9896e62f611906de708a5186ace2ba4679bd53bae48495ced5b888febb65a395cef3b11ecb595dfca079b1c3ed24fb464aa997e710ab1e
-EBUILD gitit-0.13.0.0-r1.ebuild 3424 BLAKE2B 57398fbbba7481ed01173d2c2a22eab9acf006530523d1b779230d95823b89014dae6321dbd4282ec55e563555ca44fc17cae5258fdf7445e7528898cbe39416 SHA512 f988b2dcea65a739ad27508a393a2b456d5d41315c52657997a27dca5d2e4394515bcf5271dafda1a2b00eb0f73d59bce34053272aec48105c59f21ad34484d2
-MISC metadata.xml 1346 BLAKE2B 6fefdb5be29c0938b28ec71699826f0d505a1562f4145d209756f5161d5cb8e4e2d027d8a66537ed2ae0fa14eb957050e8762a923bc5cf51797b63c5f826015a SHA512 6b0a1f69c1a8019fe437b317d251d13d608422467e570ad53798e2995fe1ef1ecf2869ab1509d081c025a6fb2abc7881bc7fbaba651dc1b29d90ecb16317f09a
diff --git a/www-apps/gitit/files/gitit-0.13.0.0-pandoc-2.12.patch b/www-apps/gitit/files/gitit-0.13.0.0-pandoc-2.12.patch
deleted file mode 100644
index abe73ed17c9e..000000000000
--- a/www-apps/gitit/files/gitit-0.13.0.0-pandoc-2.12.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/Network/Gitit/Authentication.hs b/src/Network/Gitit/Authentication.hs
-index 4c240e7..b41d87d 100644
---- a/src/Network/Gitit/Authentication.hs
-+++ b/src/Network/Gitit/Authentication.hs
-@@ -44,8 +44,8 @@ import System.Exit
- import System.Log.Logger (logM, Priority(..))
- import Data.Char (isAlphaNum, isAlpha)
- import qualified Data.Map as M
--import Text.Pandoc.Shared (substitute)
- import Data.Maybe (isJust, fromJust, isNothing, fromMaybe)
-+import Data.List (stripPrefix)
- import Network.URL (exportURL, add_param, importURL)
- import Network.BSD (getHostName)
- import qualified Text.StringTemplate as T
-@@ -54,6 +54,15 @@ import Codec.Binary.UTF8.String (encodeString)
- import Data.ByteString.UTF8 (toString)
- import Network.Gitit.Rpxnow as R
- 
-+-- Taken from Pandoc-2.11.4, no longer exported since 2.12:
-+substitute :: (Eq a) => [a] -> [a] -> [a] -> [a]
-+substitute _ _ [] = []
-+substitute [] _ xs = xs
-+substitute target replacement lst@(x:xs) =
-+    case stripPrefix target lst of
-+      Just lst' -> replacement ++ substitute target replacement lst'
-+      Nothing   -> x : substitute target replacement xs
-+
- data ValidationType = Register
-                     | ResetPassword
-                     deriving (Show,Read)
-diff --git a/src/Network/Gitit/Util.hs b/src/Network/Gitit/Util.hs
-index c5e9fe5..9588b3a 100644
---- a/src/Network/Gitit/Util.hs
-+++ b/src/Network/Gitit/Util.hs
-@@ -45,7 +45,7 @@ import Network.URL (encString)
- 
- -- | Read file as UTF-8 string.  Encode filename as UTF-8.
- readFileUTF8 :: FilePath -> IO Text
--readFileUTF8 = fmap T.pack . UTF8.readFile
-+readFileUTF8 = UTF8.readFile
- 
- -- | Perform a function a directory and return to working directory.
- inDir :: FilePath -> IO a -> IO a
diff --git a/www-apps/gitit/gitit-0.13.0.0-r1.ebuild b/www-apps/gitit/gitit-0.13.0.0-r1.ebuild
deleted file mode 100644
index b2dc02d39686..000000000000
--- a/www-apps/gitit/gitit-0.13.0.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
-HOMEPAGE="https://hackage.haskell.org/package/gitit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+plugins"
-
-RDEPEND=">=app-text/pandoc-2.9:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?]
-	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
-	>=dev-haskell/configfile-1:=[profile?]
-	>=dev-haskell/doctemplates-0.7.1:=[profile?]
-	>=dev-haskell/feed-1.0:=[profile?] <dev-haskell/feed-1.4:=[profile?]
-	>=dev-haskell/filestore-0.6.4:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
-	>=dev-haskell/happstack-server-7.5:=[profile?]
-	>=dev-haskell/hoauth2-1.3.0:=[profile?]
-	>=dev-haskell/hslogger-1:=[profile?]
-	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
-	>=dev-haskell/http-4000.0:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-	>=dev-haskell/http-conduit-2.1.6:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
-	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.11:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
-	>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
-	>=dev-haskell/network-uri-2.6:=[profile?]
-	dev-haskell/old-locale:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.20:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/recaptcha-0.1:=[profile?]
-	dev-haskell/safe:=[profile?]
-	>dev-haskell/sha-1:=[profile?]
-	>=dev-haskell/skylighting-0.8.2.3:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/uri-bytestring-0.2.3.3:=[profile?]
-	>=dev-haskell/url-2.1:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
-	dev-haskell/xhtml:=[profile?]
-	>=dev-haskell/xml-1.3.5:=[profile?]
-	>=dev-haskell/xml-conduit-1.5:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
-	>=dev-haskell/xml-types-0.3:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-8.0.1:=
-	plugins? ( dev-haskell/ghc-paths:=[profile?]
-			>=dev-lang/ghc-8.0.1:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.0
-"
-
-PATCHES=( "${FILESDIR}"/${P}-pandoc-2.12.patch )
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'aeson >= 0.7 && < 1.5' 'aeson >= 0.7' \
-		'pandoc >= 2.9 && < 2.10' 'pandoc >= 2.9' \
-		'pandoc-types >= 1.20 && < 1.21' 'pandoc-types >= 1.20' \
-		'skylighting >= 0.8.2.3 && < 0.9' 'skylighting >= 0.8.2.3' \
-		'hoauth2 >= 1.3.0 && < 1.12' 'hoauth2 >= 1.3.0' \
-		'happstack-server >= 7.5 && < 7.7' 'happstack-server >= 7.5'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag plugins plugins)
-}
diff --git a/www-apps/gitit/metadata.xml b/www-apps/gitit/metadata.xml
deleted file mode 100644
index 9c67e4331183..000000000000
--- a/www-apps/gitit/metadata.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-		Gitit is a wiki backed by a git, darcs, or mercurial
-		filestore.  Pages and uploaded files can be modified either
-		directly via the VCS's command-line tools or through
-		the wiki's web interface. Pandoc is used for markup
-		processing, so pages may be written in
-		(extended) markdown, reStructuredText, LaTeX, HTML,
-		or literate Haskell, and exported in ten different
-		formats, including LaTeX, ConTeXt, DocBook, RTF,
-		OpenOffice ODT, and MediaWiki markup.
-		
-		Notable features include
-		
-		* plugins: dynamically loaded page
-		transformations written in Haskell (see
-		"Network.Gitit.Interface")
-		
-		* conversion of TeX math to MathML for display in
-		web browsers
-		
-		* syntax highlighting of source code
-		files and code snippets
-		
-		* Atom feeds (site-wide and per-page)
-		
-		* a library, "Network.Gitit", that makes it simple
-		to include a gitit wiki in any happstack application
-		
-		You can see a running demo at &lt;http://gitit.net&gt;.
-		
-		For usage information:  @gitit --help@
-	</longdescription>
-	<use>
-		<flag name="plugins">enables optional plugin runtime loader</flag>
-	</use>
-</pkgmetadata>
diff --git a/www-apps/miniflux/Manifest b/www-apps/miniflux/Manifest
index 7c14357bf515..bfa7b8ec0da0 100644
--- a/www-apps/miniflux/Manifest
+++ b/www-apps/miniflux/Manifest
@@ -5,5 +5,8 @@ AUX miniflux.initd 504 BLAKE2B d43cc0323161fc3723063f07fb5d8da4f762b420dedbcab28
 AUX miniflux.service 463 BLAKE2B e6f1a3717e985f3ddae4224472b753f293a73ab015acbe80ddf20d2d9e505aa9fd47e2fca2c86749067288a1f10787e16179a41e5c30d3f37f53e83f798719b8 SHA512 c38fe3f19162be02a44a353281690d40e90cb8ac8126ea4f9aab1218e128da0be3d1152cf260fdfd19ecfed2ea4396ae4a6c645088a1b212b58a3cba8387ce60
 DIST miniflux-2.0.37-deps.tar.xz 154048036 BLAKE2B 88eaba31505c4d1ace55428a8e29dac8449776e1f9cd9a9fe5a54f21dee65df8ddb9c8cfc88968ec4476cc5e3d7670f47ffc98d41ea5a6fe1ae9e23bb6b09807 SHA512 c499964a174a0cef1ec09824e8b6f9fbe3ff8eb77e2f5f9f4aedd73f95c569338afd4ec5c9c312556c9435863c8a4398b63a5f24a55c61d0d8a5afd63a83f31b
 DIST miniflux-2.0.37.tar.gz 555360 BLAKE2B 64188e03583dd011261c2d69c30e105af65d61ed996c4c2785621aa74d6b0602eaeed312750a089dfb1c4f5bc00c26f79549f2df27714cdca44506439b2ba6af SHA512 6944e638cdec6d0d5e92362ad4849028d0260780919eff8d6b6999327f9a482a1b3b09f1479b3c8c4b2727ced524caa13a6c7ac655b230ff244519cfe095cbd5
+DIST miniflux-2.0.38-deps.tar.xz 154290660 BLAKE2B f8317e54ec3639e9bc90f9f28d4c645a816d8b8510df090145a87e9247c4762303276646505abf083d99dcf172a9a022c4771fdad58811779a47018158cd7690 SHA512 6390a6c06fb00428ff3088e81f9cca2b6343f77cc1151ccb8864eabac2983ec05630d18199b152c50fc7f463b14b7615fd901260444f00d4d6337740689d1eb3
+DIST miniflux-2.0.38.tar.gz 568359 BLAKE2B 5e29663c59debdbdb4c0ed8da5d27e47ad0c0db70368844c3ede965050f0fa8410e6cd14e28faf811f39a39f0b5417d2b59302ac7cf00acfea977ab2b4b732ee SHA512 7ebedc469b8aa08e8ce73b8ae0e586927847f08e541e57fdc41b440a50524649938eb86ee56d885c688e83f1aa09063514eac4c1d8ad22459589b1ea994ef8ff
 EBUILD miniflux-2.0.37.ebuild 2578 BLAKE2B 555cce45ceea4f96b75638128b60ee946532bb329f3bd4a6f93fffed8a28f8a8547331bd8c1cc73fb1bcca1234a5c8e71fce63e745294e6f9c55ad2fc6a964eb SHA512 1d5c77e1f8699ea710d38760d624f1bbd6286c4d42d1f827df516ac13a6d977ade246c0150e7de2f4509f5d31e706b6175e7b8df4b30175bf68b14f1c70c1ccd
+EBUILD miniflux-2.0.38.ebuild 2578 BLAKE2B 555cce45ceea4f96b75638128b60ee946532bb329f3bd4a6f93fffed8a28f8a8547331bd8c1cc73fb1bcca1234a5c8e71fce63e745294e6f9c55ad2fc6a964eb SHA512 1d5c77e1f8699ea710d38760d624f1bbd6286c4d42d1f827df516ac13a6d977ade246c0150e7de2f4509f5d31e706b6175e7b8df4b30175bf68b14f1c70c1ccd
 MISC metadata.xml 329 BLAKE2B 50e914926db603f0d6e89f009847cab4ed7e771c33779da94e71d78dd4322457a19c8b1f4d9a27670fcde68ffd4480582c8def09973b84cc69bcf670fabfae19 SHA512 c00ceaf0e7d32f4395cdba01ce2af24ce7ab2d50baa250abe035f78d905b864fc1e0947226fce655adb5b0355030b30adabd6c64d306b83a5b8f6aae70dcdbcf
diff --git a/www-apps/miniflux/miniflux-2.0.38.ebuild b/www-apps/miniflux/miniflux-2.0.38.ebuild
new file mode 100644
index 000000000000..005822d6132c
--- /dev/null
+++ b/www-apps/miniflux/miniflux-2.0.38.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Minimalist and opinionated feed reader"
+HOMEPAGE="https://miniflux.app https://github.com/miniflux/v2"
+SRC_URI="https://github.com/${PN}/v2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test" # requires network access
+
+DEPEND="acct-user/miniflux"
+RDEPEND="${DEPEND}
+	>=dev-db/postgresql-9.5
+"
+
+S="${WORKDIR}/v2-${PV}"
+
+src_compile() {
+	ego build -ldflags="-s -w -X 'miniflux.app/version.Version=${PV}' " -o miniflux main.go
+}
+
+src_install() {
+	dobin miniflux
+
+	insinto /etc
+	doins "${FILESDIR}/${PN}.conf"
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	fowners miniflux:root /etc/${PN}.conf
+	fperms o-rwx /etc/${PN}.conf
+
+	local DOCS=(
+		ChangeLog
+		README.md
+		"${FILESDIR}"/README.gentoo
+	)
+
+	# Makefile has no install target, so call einstalldocs directly
+	einstalldocs
+
+	doman "${PN}".1
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		echo
+		elog "Before using miniflux, you must first create and initialize the database"
+		elog "and enable the hstore extension for it."
+		elog ""
+		elog "Afterwards, create your first admin user by running:"
+		elog "  miniflux -create-admin"
+	else
+		# This is an existing installation
+
+		echo
+		elog "If you are upgrading from a previous version, schema migrations must be performed."
+		elog "To perform the migrations, stop the daemon, backup your database, and run:"
+		elog "  emerge --config =${PF}"
+	fi
+
+	echo
+	elog "Please read"
+	elog ""
+	elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+	elog ""
+	elog "for more information."
+}
+
+pkg_config() {
+	# To be safe, avoid doing migrations if miniflux is running
+	if pgrep miniflux; then
+		die "miniflux appears to be running, refusing to continue."
+	fi
+
+	# Extract the database URL variable instead of just sourcing the config file
+	# because miniflux itself may interpret quotes as part of the URL
+	local DATABASE_URL="$(sed -n 's/^DATABASE_URL=\(.*\)/\1/p' ${EROOT}/etc/${PN}.conf)"
+	[[ -n "${DATABASE_URL}" ]] || die "Failed getting DATABASE_URL from config file"
+
+	DATABASE_URL="${DATABASE_URL}" "${EROOT}"/usr/bin/miniflux -migrate || die "miniflux -migrate failed. Please check the above output for errors."
+
+	echo
+	elog "Database migrations complete."
+}