Merge updates from master

2026-07-10 15:45:15 -04:00 · 2020-05-05 10:35:01 +00:00
parent 5415323956 19d3815a9c
commit ed37311926
20 changed files with 322 additions and 48 deletions
--- a/app-emacs/vterm/Manifest
+++ b/app-emacs/vterm/Manifest
@@ -0,0 +1 @@
+DIST vterm-20200504.544.tar 184320 BLAKE2B 9a705ef3e36b8b1991e9b152b59a40f5d784631ee613056ccedffc85c690c83b0860f900d1494388047b2fec8ef7803adc7c5550b2d210e3cda95ebd8894be5c SHA512 c2971628778e9128efae5c567bd0e9453a8260032d0c220e4348e135e2d2c1af56429eebe613641bd13a148dec53e10c4604dd93a0261f2db74a1bcb8a240ff8
--- a/app-emacs/vterm/files/50vterm-gentoo.el
+++ b/app-emacs/vterm/files/50vterm-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(load "vterm-autoloads" nil t)
--- a/app-emacs/vterm/files/bashrc
+++ b/app-emacs/vterm/files/bashrc
@@ -0,0 +1,26 @@
+function vterm_printf(){
+    if [ -n "$TMUX" ]; then
+        # Tell tmux to pass the escape sequences through
+        # (Source: http://permalink.gmane.org/gmane.comp.terminal-emulators.tmux.user/1324)
+        printf "\ePtmux;\e\e]%s\007\e\\" "$1"
+    elif [ "${TERM%%-*}" = "screen" ]; then
+        # GNU screen (screen, screen-256color, screen-256color-bce)
+        printf "\eP\e]%s\007\e\\" "$1"
+    else
+        printf "\e]%s\e\\" "$1"
+    fi
+}
+
+if [[ "$INSIDE_EMACS" = 'vterm' ]]; then
+    function clear(){
+        vterm_printf "51;Evterm-clear-scrollback";
+        tput clear;
+    }
+fi
+
+PROMPT_COMMAND='echo -ne "\033]0;\h:\w\007"'
+
+vterm_prompt_end(){
+    vterm_printf "51;A$(whoami)@$(hostname):$(pwd)"
+}
+PS1=$PS1'\[$(vterm_prompt_end)\]'
--- a/app-emacs/vterm/files/config.fish
+++ b/app-emacs/vterm/files/config.fish
@@ -0,0 +1,30 @@
+function vterm_printf;
+    if [ -n "$TMUX" ]
+        # tell tmux to pass the escape sequences through
+        # (Source: http://permalink.gmane.org/gmane.comp.terminal-emulators.tmux.user/1324)
+        printf "\ePtmux;\e\e]%s\007\e\\" "$argv"
+    else if string match -q -- "screen*" "$TERM"
+        # GNU screen (screen, screen-256color, screen-256color-bce)
+        printf "\eP\e]%s\007\e\\" "$argv"
+    else
+        printf "\e]%s\e\\" "$argv"
+    end
+end
+
+function fish_title
+    hostname
+    echo ":"
+    pwd
+end
+
+function vterm_prompt_end;
+    vterm_printf '51;A'(whoami)'@'(hostname)':'(pwd)
+end
+functions -c fish_prompt vterm_old_fish_prompt
+function fish_prompt --description 'Write out the prompt; do not replace this. Instead, put this at end of your file.'
+    # Remove the trailing newline from the original prompt. This is done
+    # using the string builtin from fish, but to make sure any escape codes
+    # are correctly interpreted, use %b for printf.
+    printf "%b" (string join "\n" (vterm_old_fish_prompt))
+    vterm_prompt_end
+end
--- a/app-emacs/vterm/files/zshrc
+++ b/app-emacs/vterm/files/zshrc
@@ -0,0 +1,25 @@
+function vterm_printf(){
+    if [ -n "$TMUX" ]; then
+        # Tell tmux to pass the escape sequences through
+        # (Source: http://permalink.gmane.org/gmane.comp.terminal-emulators.tmux.user/1324)
+        printf "\ePtmux;\e\e]%s\007\e\\" "$1"
+    elif [ "${TERM%%-*}" = "screen" ]; then
+        # GNU screen (screen, screen-256color, screen-256color-bce)
+        printf "\eP\e]%s\007\e\\" "$1"
+    else
+        printf "\e]%s\e\\" "$1"
+    fi
+}
+
+if [[ "$INSIDE_EMACS" = 'vterm' ]]; then
+    alias clear='vterm_printf "51;Evterm-clear-scrollback";tput clear'
+fi
+
+autoload -U add-zsh-hook
+add-zsh-hook -Uz chpwd (){ print -Pn "\e]2;%m:%2~\a" }
+
+vterm_prompt_end() {
+    vterm_printf "51;A$(whoami)@$(hostname):$(pwd)";
+}
+setopt PROMPT_SUBST
+PROMPT=$PROMPT'%{$(vterm_prompt_end)%}'
--- a/app-emacs/vterm/metadata.xml
+++ b/app-emacs/vterm/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>arjan@adriaan.se</email>
+  <name>Arjan Adriaanse</name>
+</maintainer>
+<longdescription>
+ Emacs-libvterm (vterm) is fully-fledged terminal emulator inside GNU
+ Emacs based on libvterm, a C library. As a result of using compiled
+ code (instead of elisp), emacs-libvterm is fully capable, fast, and
+ it can seamlessly handle large outputs.
+
+ This package automatically compiles the needed module and provides
+ configurations for better integration with some shells.
+</longdescription>
+<upstream>
+  <maintainer status="active">
+    <email>fuermetz@mailbox.org</email>
+    <name>Lukas Fürmetz</name>
+  </maintainer>
+  <doc>https://github.com/akermu/emacs-libvterm/blob/master/README.md</doc>
+  <bugs-to>https://github.com/akermu/emacs-libvterm/issues</bugs-to>
+  <remote-id type="github">akermu/emacs-libvterm</remote-id>
+</upstream>
+</pkgmetadata>
--- a/app-emacs/vterm/vterm-20200504.544.ebuild
+++ b/app-emacs/vterm/vterm-20200504.544.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp cmake
+
+DESCRIPTION="Emacs libvterm integration"
+HOMEPAGE="https://github.com/akermu/emacs-libvterm"
+SRC_URI="https://melpa.org/packages/${PN}-${PV}.tar -> ${P}.tar"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-editors/emacs[dynamic-loading]
+	dev-libs/libvterm
+"
+
+ELISP_REMOVE="${PN}-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+	elisp-make-autoload-file
+
+	local mycmakeargs=( "USE_SYSTEM_LIBVTERM=yes" )
+	cmake_src_configure
+}
+
+src_compile() {
+	elisp_src_compile
+
+	cmake_src_compile
+}
+
+src_install() {
+	elisp_src_install
+
+	dodoc README.md
+
+	# install vterm module
+	elisp-install ${PN} *.so
+
+	# add shell config files
+	if has_version app-shells/bash; then
+		elog "Adding configuration for bash."
+		exeinto /etc/bash/bashrc.d/
+		newexe "${FILESDIR}/bashrc" bash-emacs-vterm.sh
+	fi
+	if has_version app-shells/zsh; then
+		elog "Adding configuration for zsh."
+		exeinto /etc/profile.d/
+		newexe "${FILESDIR}/zshrc" zsh-emacs-vterm.sh
+	fi
+	if has_version app-shells/fish; then
+		elog "Adding configuration for fish."
+		exeinto /etc/fish/conf.d/
+		newexe "${FILESDIR}/config.fish" emacs-vterm.fish
+	fi
+}
--- a/app-misc/apidb/Manifest
+++ b/app-misc/apidb/Manifest
@@ -0,0 +1 @@
+DIST 4.3.0-beta.2.tar.gz 168416 BLAKE2B a3c6e948d0227c6bfc1e030111c0c31fe89ebc294f283246f3446d611ae4d4353534c9270dac40fb46b9189d8ea42ab0f10c2e2d783af8499442c207bd76e3dd SHA512 efc0733ea683a47a2e10e97a53ea6ed378aa152b191d7689529a9acfe0866c7aefec2987b9094c4874c4966ae5869a133a5b194de8e99af338282ff30f2586ad
--- a/app-misc/apidb/apidb-4.3.0_beta.ebuild
+++ b/app-misc/apidb/apidb-4.3.0_beta.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MYPV="${PV/_beta/-beta.2}"
+
+DESCRIPTION="API Generator for Database acces."
+HOMEPAGE="https://github.com/azaeldevel/apidb"
+SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	dev-libs/boost
+	sys-devel/bison
+	sys-devel/flex
+	x11-libs/gtk+
+	dev-libs/libtar
+	dev-db/mariadb
+	dev-libs/octetos-db-maria
+	media-gfx/imagemagick
+"
+
+S="${WORKDIR}/${PN}-${MYPV}"
+
+src_prepare() {
+	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
+	#sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
+	sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(-DCMAKE_BUILD_TYPE=Debug -DAPIDB_VERSION_STAGE=betarelease -DAPIDB_MARIADB=Y -Wno-dev)
+	cmake_src_configure
+}
--- a/app-misc/apidb/metadata.xml
+++ b/app-misc/apidb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>azael.devel@gmail.com</email>
+		<name>Azael Reyes</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-libs/octetos-core/Manifest
+++ b/dev-libs/octetos-core/Manifest
@@ -1,3 +1,4 @@
 DIST 1.2.2-br.tar.gz 121036 BLAKE2B 7dabc3013432ce5b7fd612a0b1634ebe5943a53de9031ccb7d7fd8fff95dd79f2d35553ec4b6b50e790bb115c762022c6f5d64d2525997e7af80bc7272d902ff SHA512 c7aef25a9547a202908a69679df42b8f7a988c3cbf8f87d1941aa6fb623d3979412900e97a41e3024d708dbd9cd968cecf57aa6f2ff20669c1e3e29947bd5571
 DIST 2.0.0-alpha.2.tar.gz 122978 BLAKE2B 9ed7fcb95b9c2f85072bf73ac92710eaa9eb4c82e053f5f9b95220df47721ed115a2eeb32de9a19217cc97ad7b09797c03319df06bde3697a10ab81766d0bfa1 SHA512 fd35a35ddf18b869e393add16b237e7a489674b51b49ce6816367d95a0a8573dda90ac4e8c64ec35267e1192d63890b1a479ee7e5bb7162aa3c1858708fd95dd
 DIST 2.2.0-beta.3.tar.gz 123176 BLAKE2B f87131deccefce76a7fefb0e829564c166f01f316c54bd56e1283999434db809cb54be2278e1653dcb3a01a371b09b08fd95decf1b361c1515e5decf3609453d SHA512 10f70c02b7c0012f1dab31e96aa3337dccc662c51a31c2ad186b6e76815afa8645f3f2370d6eaa788cdbbded416bc36b53e1971005cca49ee10c0d8e6baac239
+DIST 2.2.1-beta.1.tar.gz 123179 BLAKE2B f31f1870c3467c02f2b7653dd81abdf44e1c8ab821d8ec404f0a9ddb296438caa631dd586c62727eb9ecaf83452a2b0923f2a72323e5a49e895b99b9296e409f SHA512 408569368b3dc2257149ad4c25c07a8deb3176fc6b08a003c98e59386ece3adcf0a45198b3802e3c0c1f537d4feb30703d5997f5bcae4e9d9e708829da46a843
--- a/dev-libs/octetos-core/octetos-core-1.2.2_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-1.2.2_beta.ebuild
@@ -5,9 +5,11 @@ EAPI=7

 inherit autotools

+MYPV="${PV/_beta/-br}"
+
 DESCRIPTION="C/C++ library to mainly provide Semantic Versioned implementation"
 HOMEPAGE="https://github.com/azaeldevel/octetos-core"
-SRC_URI="https://github.com/azaeldevel/octetos-core/archive/1.2.2-br.tar.gz"
+SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
@@ -24,17 +26,9 @@ BDEPEND="
 	dev-libs/libconfig
 "

-src_unpack() {
-	default
-	ln -s octetos-core-1.2.2-br "${P}"
-}
+S="${WORKDIR}/${PN}-${MYPV}"

-src_configure() {
+src_prepare() {
+	default
 	eautoreconf -fi
 }
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake || die "emake failed"
-	fi
-}
--- a/dev-libs/octetos-core/octetos-core-2.0.0_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.0.0_beta.ebuild
@@ -5,9 +5,11 @@ EAPI=7

 inherit autotools

+MYPV="${PV/_beta/-alpha.2}"
+
 DESCRIPTION="C/C++ library to mainly provide Semantic Versioned implementation"
 HOMEPAGE="https://github.com/azaeldevel/octetos-core"
-SRC_URI="https://github.com/azaeldevel/octetos-core/archive/2.0.0-alpha.2.tar.gz"
+SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
@@ -24,23 +26,9 @@ BDEPEND="
 	dev-libs/libconfig
 "

-src_unpack() {
-	default
-	ln -s octetos-core-2.0.0-alpha.2 "${P}"
-}
+S="${WORKDIR}/${PN}-${MYPV}"

 src_prepare() {
+	default
 	eautoreconf -fi
-	eapply_user
-}
-
-src_configure() {
-	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-		econf
-	fi
-}
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake || die "emake failed"
-	fi
 }
--- a/dev-libs/octetos-core/octetos-core-2.2.0_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.2.0_beta.ebuild
@@ -5,9 +5,11 @@ EAPI=7

 inherit autotools

+MYPV="${PV/_beta/-beta.3}"
+
 DESCRIPTION="C/C++ library to mainly provide Semantic Versioned implementation"
 HOMEPAGE="https://github.com/azaeldevel/octetos-core"
-SRC_URI="https://github.com/azaeldevel/octetos-core/archive/2.2.0-beta.3.tar.gz"
+SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
@@ -23,24 +25,9 @@ BDEPEND="
 	dev-libs/libconfig
 "

-src_unpack() {
-	default
-	ln -s octetos-core-2.2.0-beta.3 "${P}"
-}
+S="${WORKDIR}/${PN}-${MYPV}"

 src_prepare() {
+	default
 	eautoreconf -fi
-	eapply_user
-}
-
-src_configure() {
-	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-		econf
-	fi
-}
-
-src_compile() {
-	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
-		emake || die "emake failed"
-	fi
 }
--- a/dev-libs/octetos-core/octetos-core-2.2.1_beta.ebuild
+++ b/dev-libs/octetos-core/octetos-core-2.2.1_beta.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MYPV="${PV/_beta/-beta.1}"
+
+DESCRIPTION="C/C++ library to mainly provide Semantic Versioned implementation"
+HOMEPAGE="https://github.com/azaeldevel/octetos-core"
+SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/gcc-8.1
+	>=sys-devel/bison-3.1
+	dev-libs/libconfig
+"
+
+S="${WORKDIR}/${PN}-${MYPV}"
+
+src_prepare() {
+	default
+	eautoreconf -fi
+}
--- a/dev-libs/octetos-db-maria/Manifest
+++ b/dev-libs/octetos-db-maria/Manifest
@@ -0,0 +1 @@
+DIST 1.2.2-alpha.6.tar.gz 91810 BLAKE2B 9c274928564e61e20ba5d553c41b588333b0abc52d6d964eb8c39e225a72d19c6b6cf953d94240245bad72e318edfce30662d1ed59fd0edf42159794c6be6952 SHA512 cde9aa8dc8552f5c4d10bef9908dc514e5cecfba73f3b67bd817e9818f84e665cc506648e15fe47dcd5ab0a8ae4943340e258c5a4b2b7546e65fb38455956c45
--- a/dev-libs/octetos-db-maria/metadata.xml
+++ b/dev-libs/octetos-db-maria/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>azael.devel@gmail.com</email>
+		<name>Azael Reyes</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-libs/octetos-db-maria/octetos-db-maria-1.2.2_beta.ebuild
+++ b/dev-libs/octetos-db-maria/octetos-db-maria-1.2.2_beta.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MYPV="${PV/_beta/-alpha.6}"
+MYPN="${PN/-maria}"
+MYP="${MYPN}-${MYPV}"
+
+DESCRIPTION="C++ library for Database Acces."
+HOMEPAGE="https://github.com/azaeldevel/octetos-db"
+SRC_URI="https://github.com/azaeldevel/${MYPN}/archive/${MYPV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND="dev-libs/octetos-core dev-db/mariadb-connector-c"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	default
+	eautoreconf -fi
+}
+
+src_configure() {
+	econf --with-mariadb
+}
--- a/games-action/technic-launcher/Manifest
+++ b/games-action/technic-launcher/Manifest
@@ -1,2 +1,2 @@
-DIST technic-launcher-4.510.jar 5541495 BLAKE2B 249b553abc7cffd0c823fa09801dc16cb0ae94b0a8179dcbc1cdb043d5fc3a459034c9c26de96e8fca171cacdced57b5059b4845db041091c30ebfe8df7a0aca SHA512 5219ebf0faa41cc3d5c4444cd561f69dd6215eb1bc1d2c99c5b693b419c8085544902c7df960cc07ddedff7f14aa58f71a840cae07fae912f4a96761afc32466
+DIST technic-launcher-4.525.jar 5554894 BLAKE2B 2c7e3c0e332c877fc8a6cf6c105d18fbd4a1ddfd3d5eebe78909e5e339bbc236ecd112de039680fd867da38357eaf0b606f57ce23f5fea5c5f12dbb63de6bbdb SHA512 254e9d3e2b465e1e828bc24d62bc7c640892d9edcc2e615ed3e29f5bfbfa84cd5c71a7e7f767dcfdb9616d398a68c4dadf2a31f22f732933cd67ce1f7217f000
 DIST technic-launcher.ico 15086 BLAKE2B 4f5be0661bfbdca971cf022767618acef1e912b60c3f0574f383a8bd0281a6d66ca1b8b105412ec9579f3999514a471412fb16da66d937acfb4d3236b8f99663 SHA512 c109113a0e1be10bc013bfb79b742396a768fa683860a83d734e158b709e66b9e21067e1791ae5f7a854ccd21b1bf9adf6eeb27bc33d9da03f902dfe5d8be710
--- a/games-action/technic-launcher/technic-launcher-4.525.ebuild
+++ b/games-action/technic-launcher/technic-launcher-4.525.ebuild
				`@@ -0,0 +1 @@`
				`DIST vterm-20200504.544.tar 184320 BLAKE2B 9a705ef3e36b8b1991e9b152b59a40f5d784631ee613056ccedffc85c690c83b0860f900d1494388047b2fec8ef7803adc7c5550b2d210e3cda95ebd8894be5c SHA512 c2971628778e9128efae5c567bd0e9453a8260032d0c220e4348e135e2d2c1af56429eebe613641bd13a148dec53e10c4604dd93a0261f2db74a1bcb8a240ff8`
				`@@ -0,0 +1 @@`
				`DIST 4.3.0-beta.2.tar.gz 168416 BLAKE2B a3c6e948d0227c6bfc1e030111c0c31fe89ebc294f283246f3446d611ae4d4353534c9270dac40fb46b9189d8ea42ab0f10c2e2d783af8499442c207bd76e3dd SHA512 efc0733ea683a47a2e10e97a53ea6ed378aa152b191d7689529a9acfe0866c7aefec2987b9094c4874c4966ae5869a133a5b194de8e99af338282ff30f2586ad`
				`@@ -0,0 +1 @@`
				`DIST 1.2.2-alpha.6.tar.gz 91810 BLAKE2B 9c274928564e61e20ba5d553c41b588333b0abc52d6d964eb8c39e225a72d19c6b6cf953d94240245bad72e318edfce30662d1ed59fd0edf42159794c6be6952 SHA512 cde9aa8dc8552f5c4d10bef9908dc514e5cecfba73f3b67bd817e9818f84e665cc506648e15fe47dcd5ab0a8ae4943340e258c5a4b2b7546e65fb38455956c45`