Adding metadata

3 files changed, 186 insertions, 118 deletions

diff --git a/app-portage/eix/eix-0.36.0-r1.ebuild b/app-portage/eix/eix-0.36.0-r1.ebuild
deleted file mode 100644
index 708a7e43215d..000000000000
--- a/app-portage/eix/eix-0.36.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 2020-2021 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc nls sqlite"
-
-DEPEND="
-	nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${DEPEND}
-	>=app-shells/push-2.0-r1
-	>=app-shells/quoter-3.0_p2-r1"
-BDEPEND="
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-	eapply "${FILESDIR}"/ego-sync.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug paranoic-asserts)
-		$(use_enable nls)
-		$(use_with doc extra-doc)
-		$(use_with sqlite)
-		--without-protobuf
-
-		# default configuration
-		$(use_with prefix always-accept-keywords)
-		--with-dep-default
-		--with-required-use-default
-
-		# paths
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-
-		# build a single executable with symlinks
-		--disable-separate-binaries
-		--disable-separate-tools
-
-		# used purely to control/disrespect *FLAGS
-		--disable-debugging
-		--disable-new_dialect
-		--disable-optimization
-		--disable-strong-optimization
-		--disable-security
-		--disable-nopie-security
-		--disable-strong-security
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-	diropts -o portage -g portage
-	dodir "${EROOT}/var/cache/${PN}"
-
-	rm -r "${ED}"/usr/bin/eix-functions.sh || die
-}
-
-pkg_postinst() {
-	tmpfiles_process eix.conf
-
-	local obs=${EROOT}/var/cache/eix.previous
-	if [[ -f ${obs} ]]; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.36.0-r2.ebuild b/app-portage/eix/eix-0.36.0-r2.ebuild
new file mode 100644
index 000000000000..12854c246a19
--- /dev/null
+++ b/app-portage/eix/eix-0.36.0-r2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 2021 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+RESTRICT="mirror" # do not access gentoo mirror until it actually is there
+MESON_AUTO_DEPEND=no
+inherit bash-completion-r1 meson tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_sse2 debug +dep doc +jumbo-build +meson nls optimization +protobuf +required-use security +src-uri strong-optimization strong-security sqlite swap-remote tools usr-portage"
+
+PLOCALES="de ru"
+for i in ${PLOCALES}; do
+	IUSE+=" l10n_${i}"
+done
+
+DEPEND="nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${DEPEND}
+	>=app-shells/push-3.1
+	>=app-shells/quoter-4.1"
+BDEPEND="meson? (
+		>=dev-util/meson-0.41.0
+		>=dev-util/ninja-1.7.2
+		strong-optimization? ( >=sys-devel/gcc-config-1.9.1 )
+	)
+	protobuf? ( dev-libs/protobuf:= )
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache="${EROOT}var/cache/${PN}"
+	test -f "${old_cache}" && rm -f -- "${old_cache}"
+}
+
+src_prepare() {
+	sed -i -e "s'/'${EPREFIX}/'" -- "${S}"/tmpfiles.d/eix.conf || die
+	eapply "${FILESDIR}"/ego-sync.patch
+	default
+}
+
+src_configure() {
+	local i
+	export LINGUAS=
+	for i in ${PLOCALES}; do
+		use l10n_${i} && LINGUAS+=${LINGUAS:+ }${i}
+	done
+
+	if use meson; then
+		local emesonargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${P}"
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html"
+		$(meson_use jumbo-build)
+		$(meson_use sqlite)
+		$(meson_use protobuf)
+		$(meson_use doc extra-doc)
+		$(meson_use nls)
+		$(meson_use tools separate-tools)
+		$(meson_use security)
+		$(meson_use optimization normal-optimization)
+		$(meson_use strong-security)
+		$(meson_use strong-optimization)
+		$(meson_use debug debugging)
+		$(meson_use swap-remote)
+		$(meson_use prefix always-accept-keywords)
+		$(meson_use cpu_flags_x86_sse2 sse2)
+		$(meson_use dep dep-default)
+		$(meson_use required-use required-use-default)
+		$(meson_use src-uri src-uri-default)
+		$(usex usr-portage -Dportdir-default=/usr/portage '')
+		-Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions"
+		-Dportage-rootpath="${ROOTPATH}"
+		-Deprefix-default="${EPREFIX}"
+		)
+		if use prefix; then
+			emesonarge+=(
+				-Deix-user=
+				-Deix-uid=-1
+			)
+		fi
+		meson_src_configure
+	else
+		local myconf=(
+		$(use_enable jumbo-build)
+		$(use_with sqlite)
+		$(use_with protobuf)
+		$(use_with doc extra-doc)
+		$(use_enable nls)
+		$(use_enable tools separate-tools)
+		$(use_enable security)
+		$(use_enable optimization)
+		$(use_enable strong-security)
+		$(use_enable strong-optimization)
+		$(use_enable debug debugging)
+		$(use_enable swap-remote)
+		$(use_with prefix always-accept-keywords)
+		$(use_with cpu_flags_x86_sse2 sse2)
+		$(use_with dep dep-default)
+		$(use_with required-use required-use-default)
+		$(use_with src-uri src-uri-default)
+		$(use_with usr-portage portdir-default /usr/portage)
+		--with-zsh-completion
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+		)
+		if use prefix; then
+			myconf+=(
+				--with-eix-user=
+				--with-eix-uid=-1
+			)
+		fi
+		econf "${myconf[@]}"
+	fi
+}
+
+src_compile() {
+	if use meson; then
+		meson_src_compile
+	else
+		default
+	fi
+}
+
+src_test() {
+	if use meson; then
+		meson_src_test
+	else
+		default
+	fi
+}
+
+src_install() {
+	if use meson; then
+		meson_src_install
+	else
+		default
+	fi
+
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+	use doc && dodoc src/output/eix.proto
+}
+
+pkg_postinst() {
+	local obs="${EROOT}var/cache/eix.previous"
+	if test -f "${obs}"; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+	tmpfiles_process eix.conf
+}
+
+pkg_postrm() {
+	if [ -z "${REPLACED_BY_VERSION}" ]; then
+		rm -rf -- "${EROOT}var/cache/${PN}"
+	fi
+}
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index 7b0c239f4236..e3a62007bd66 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -6,23 +6,33 @@
   <name>Development</name>
  </maintainer>
  <maintainer type="person">
-  <email>zlogene@gentoo.org</email>
-  <name>Mikle Kolyada</name>
- </maintainer>
- <maintainer type="person">
-  <email>mgorny@gentoo.org</email>
-  <name>Michał Górny</name>
- </maintainer>
- <maintainer type="person">
   <email>martin@mvath.de</email>
   <name>Martin Väth</name>
-  <description>Upstream developer, CC on bugs, do not copy ebuilds&#xA;      from his overlay</description>
  </maintainer>
- 
  <use>
   <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
-  <flag name="doc">Create description of the eix cache file additionally in html format</flag>
-  <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
- </use>
+  <flag name="dep">Make DEP=true the default which enables support for {,R,P,B}DEPEND but requires roughly double disk and memory.</flag>
+    <flag name="doc">Create description of the eix cache file additionally in html format</flag>
+    <flag name="jumbo-build">Compile faster and produce better binary. Recommended unless compiling on a quite memory-restricted system.</flag>
+    <flag name="meson">Build with meson instead of autotools. Faster but less compatible</flag>
+    <flag name="optimization">Accept upstream's choices for CXXFLAGS/LDFLAGS for optimization. Absense of this USE flag does not strip user's *FLAGS</flag>
+    <flag name="protobuf">Use dev-libs/protobuf to suport proto output with --proto</flag>
+    <flag name="required-use">Make REQUIRED_USE=true the default which enables support for REQUIRED_USE but requires more disk and memory.</flag>
+    <flag name="security">This adds some checks which can prevent certain exploits if e.g. the eix code has a bug. If you use the hardened toolchain, using this flag does not increase security and can even lead to problems.</flag>
+    <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
+    <flag name="src-uri">Make SRC_URI=true the default which enables support for SRC_URI but requires roughly double disk and memory.</flag>
+    <flag name="strong-optimization">Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS</flag>
+    <flag name="strong-security">Add many checks to prevent exploits if eix code has a bug. This will slow down eix considerably. Use only if you are paranoid or have reasons to suspect a bug.</flag>
+    <flag name="swap-remote">Swap role of remote addresses in eix-remote, making the data from gpo.zugaina.org the first choice.</flag>
+    <flag name="tools">Create separate binary for script helper tools; useful if they are called extremely often</flag>
+    <flag name="usr-portage">Set last PORTDIR fallback to /usr/portage instead of /var/db/repos/gentoo</flag>
+  </use>
+  <upstream>
+    <maintainer>
+      <email>martin@mvath.de</email>
+      <name>Martin Väth</name>
+    </maintainer>
+    <bugs-to>mailto:martin@mvath.de</bugs-to>
+  </upstream>
  <origin>kit-fixups</origin>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>