commit:     ecefd9751563f5858ba4548fb64cc5ec679473ac
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 11:47:16 2024 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 11:48:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecefd975

media-video/aegisub: Bump to 3.4.0

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 media-video/aegisub/Manifest                       |   1 +
 .../{aegisub-9999.ebuild => aegisub-3.4.0.ebuild}  |  69 +++----
 media-video/aegisub/aegisub-9999.ebuild            |  71 +++----
 .../files/3.4.0/Fix-build-without-pch.patch        | 229 +++++++++++++++++++++
 .../files/3.4.0/Use-generated-git-version.patch    |  20 ++
 media-video/aegisub/files/3.4.0/git_version.h      |   5 +
 media-video/aegisub/files/9999/git_version.h       |   5 +
 media-video/aegisub/metadata.xml                   |   4 +-
 8 files changed, 321 insertions(+), 83 deletions(-)

diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index 7b5a07fc0b8b..c65ffd2a41b8 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -1 +1,2 @@
 DIST aegisub-3.3.3.tar.gz 6580314 BLAKE2B 
b6a6b6d9a805fb1aec943f00452e5f074c050d7d8970e0fa57da54a7a3c12b86241eafafd957577625bcce395c9f909fe60a22c9d76fcf8f018a4ea03921dacf
 SHA512 
19e44667ad8742560559387c15f6c00339194cd26e1140624c63f34c6b4da6bb0b80be0f636a2d1cd0b15f1598e0580218d648e0622635b12eeaad3a40df9abc
+DIST aegisub-3.4.0.tar.gz 6294724 BLAKE2B 
6ab466a33082107f509675eb062a679c68da5b3ec9d97847d0c50ad43d717ff50efcb4fb59a2e8c23f57e893de846b651b7a80a117f047734e6d54ccf6522ef3
 SHA512 
364f56aece74b14f37d796e364ffcc5b9d8ab5816f8e118b7f44d2d4e3bdf8afa0731c36995269dd953d2f532e7a905729bcbfa907c672a8eb91b68565c1ade0

diff --git a/media-video/aegisub/aegisub-9999.ebuild 
b/media-video/aegisub/aegisub-3.4.0.ebuild
similarity index 59%
copy from media-video/aegisub/aegisub-9999.ebuild
copy to media-video/aegisub/aegisub-3.4.0.ebuild
index 530606341ba5..82d80b7054ce 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-3.4.0.ebuild
@@ -9,23 +9,23 @@ LUA_REQ_USE="lua52compat"
 WX_GTK_VER=3.2-gtk3
 PLOCALES="ar be bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl 
pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW"
 
-inherit autotools flag-o-matic lua-single plocale wxwidgets xdg-utils 
vcs-snapshot toolchain-funcs
+inherit meson flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot 
toolchain-funcs
 
 DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/wangqr/Aegisub";
+HOMEPAGE="http://www.aegisub.org/ https://github.com/TypesettingTools/Aegisub";
 
 if [[ ${PV} == *9999 ]]; then
-       EGIT_REPO_URI="https://github.com/wangqr/${PN^}.git";
+       EGIT_REPO_URI="https://github.com/TypesettingTools/${PN^}.git";
        # Submodules are used to pull bundled libraries.
        EGIT_SUBMODULES=()
        inherit git-r3
 else
-       SRC_URI="https://github.com/wangqr/Aegisub/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+       
SRC_URI="https://github.com/TypesettingTools/Aegisub/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+IUSE="+alsa debug +fftw openal portaudio pulseaudio spell test +uchardet"
 RESTRICT="test"
 
 # aegisub bundles luabins (https://github.com/agladysh/luabins).
@@ -68,19 +68,18 @@ BDEPEND="dev-util/intltool
 "
 
 REQUIRED_USE="${LUA_REQUIRED_USE}
-       || ( alsa openal oss portaudio pulseaudio )"
+       || ( alsa openal portaudio pulseaudio )"
+
+BUILD_DIR="${WORKDIR}/${P}-build"
 
 PATCHES=(
-       
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch"
-       "${FILESDIR}/3.3.3/${PN}-3.3.3-support-system-gtest.patch"
-       
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-tests_luarocks_lua_version.patch"
-       
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost-181-build.patch"
-       "${FILESDIR}/3.3.3/${PN}-3.3.3-support-icu-75.patch"
+"${FILESDIR}/3.4.0/Fix-build-without-pch.patch"
+"${FILESDIR}/3.4.0/Use-generated-git-version.patch"
 )
 
 aegisub_check_compiler() {
-       if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++17; then
-               die "Your compiler lacks C++17 support."
+       if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++20; then
+               die "Your compiler lacks C++20 support."
        fi
 }
 
@@ -106,43 +105,33 @@ src_prepare() {
        plocale_find_changes 'po' '' '.po'
        plocale_for_each_disabled_locale remove_locale
 
-       # See http://devel.aegisub.org/ticket/1914
-       config_rpath_update "${S}"/config.rpath
+       use test || sed -i "s|subdir('tests')||g" "${S}"/meson.build || die
 
-       eautoreconf
+       mkdir "${BUILD_DIR}" || die
+       cp "${FILESDIR}/${PV}"/git_version.h "${BUILD_DIR}"/git_version.h || die
 }
 
 src_configure() {
        tc-export PKG_CONFIG
-       # Prevent access violations from OpenAL detection. See Gentoo bug 
508184.
-       use openal && export agi_cv_with_openal="yes"
-
+       use debug && EMESON_BUILDTYPE=debug
        setup-wxwidgets
-       local myeconfargs=(
-               --disable-update-checker
-               --with-ffms2
-               --with-system-luajit
-               $(use_enable debug)
-               $(use_with alsa)
-               $(use_with fftw fftw3)
-               $(use_with openal)
-               $(use_with oss)
-               $(use_with portaudio)
-               $(use_with pulseaudio libpulse)
-               $(use_with spell hunspell)
-               $(use_with uchardet)
+       local emesonargs=(
+               -Denable_update_checker=false
+               -Dffms2=enabled
+               -Dsystem_luajit=true
+               $(meson_feature alsa)
+               $(meson_feature fftw fftw3)
+               $(meson_feature openal)
+               $(meson_feature portaudio)
+               $(meson_feature pulseaudio libpulse)
+               $(meson_feature spell hunspell)
+               $(meson_feature uchardet)
        )
-       export FORCE_GIT_VERSION="v${PV}"
-       econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-       emake WITH_SYSTEM_GTEST=$(usex test)
+       meson_src_configure
 }
 
 src_test() {
-       emake test-automation
-       emake test-libaegisub
+       meson_src_test test-libaegisub
 }
 
 pkg_postinst() {

diff --git a/media-video/aegisub/aegisub-9999.ebuild 
b/media-video/aegisub/aegisub-9999.ebuild
index 530606341ba5..382c883351f0 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -7,25 +7,25 @@ LUA_COMPAT=( luajit )
 LUA_REQ_USE="lua52compat"
 
 WX_GTK_VER=3.2-gtk3
-PLOCALES="ar be bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl 
pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW"
+PLOCALES="ar be bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl 
pt_BR pt_PT ru sr_RS sr_RS@latin tr uk_UA vi zh_CN zh_TW"
 
-inherit autotools flag-o-matic lua-single plocale wxwidgets xdg-utils 
vcs-snapshot toolchain-funcs
+inherit meson flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot 
toolchain-funcs
 
 DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/wangqr/Aegisub";
+HOMEPAGE="http://www.aegisub.org/ https://github.com/TypesettingTools/Aegisub";
 
 if [[ ${PV} == *9999 ]]; then
-       EGIT_REPO_URI="https://github.com/wangqr/${PN^}.git";
+       EGIT_REPO_URI="https://github.com/TypesettingTools/${PN^}.git";
        # Submodules are used to pull bundled libraries.
        EGIT_SUBMODULES=()
        inherit git-r3
 else
-       SRC_URI="https://github.com/wangqr/Aegisub/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+       
SRC_URI="https://github.com/TypesettingTools/Aegisub/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
        KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+IUSE="+alsa debug +fftw openal portaudio pulseaudio spell test +uchardet"
 RESTRICT="test"
 
 # aegisub bundles luabins (https://github.com/agladysh/luabins).
@@ -68,19 +68,18 @@ BDEPEND="dev-util/intltool
 "
 
 REQUIRED_USE="${LUA_REQUIRED_USE}
-       || ( alsa openal oss portaudio pulseaudio )"
+       || ( alsa openal portaudio pulseaudio )"
+
+BUILD_DIR="${WORKDIR}/${P}-build"
 
 PATCHES=(
-       
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch"
-       "${FILESDIR}/3.3.3/${PN}-3.3.3-support-system-gtest.patch"
-       
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-tests_luarocks_lua_version.patch"
-       
"${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost-181-build.patch"
-       "${FILESDIR}/3.3.3/${PN}-3.3.3-support-icu-75.patch"
+"${FILESDIR}/3.4.0/Fix-build-without-pch.patch"
+"${FILESDIR}/3.4.0/Use-generated-git-version.patch"
 )
 
 aegisub_check_compiler() {
-       if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++17; then
-               die "Your compiler lacks C++17 support."
+       if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++20; then
+               die "Your compiler lacks C++20 support."
        fi
 }
 
@@ -106,43 +105,33 @@ src_prepare() {
        plocale_find_changes 'po' '' '.po'
        plocale_for_each_disabled_locale remove_locale
 
-       # See http://devel.aegisub.org/ticket/1914
-       config_rpath_update "${S}"/config.rpath
+       use test || sed -i "s|subdir('tests')||g" "${S}"/meson.build || die
 
-       eautoreconf
+       mkdir "${BUILD_DIR}" || die
+       cp "${FILESDIR}/${PV}"/git_version.h "${BUILD_DIR}"/git_version.h || die
 }
 
 src_configure() {
        tc-export PKG_CONFIG
-       # Prevent access violations from OpenAL detection. See Gentoo bug 
508184.
-       use openal && export agi_cv_with_openal="yes"
-
+       use debug && EMESON_BUILDTYPE=debug
        setup-wxwidgets
-       local myeconfargs=(
-               --disable-update-checker
-               --with-ffms2
-               --with-system-luajit
-               $(use_enable debug)
-               $(use_with alsa)
-               $(use_with fftw fftw3)
-               $(use_with openal)
-               $(use_with oss)
-               $(use_with portaudio)
-               $(use_with pulseaudio libpulse)
-               $(use_with spell hunspell)
-               $(use_with uchardet)
+       local emesonargs=(
+               -Denable_update_checker=false
+               -Dffms2=enabled
+               -Dsystem_luajit=true
+               $(meson_feature alsa)
+               $(meson_feature fftw fftw3)
+               $(meson_feature openal)
+               $(meson_feature portaudio)
+               $(meson_feature pulseaudio libpulse)
+               $(meson_feature spell hunspell)
+               $(meson_feature uchardet)
        )
-       export FORCE_GIT_VERSION="v${PV}"
-       econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-       emake WITH_SYSTEM_GTEST=$(usex test)
+       meson_src_configure
 }
 
 src_test() {
-       emake test-automation
-       emake test-libaegisub
+       meson_src_test test-libaegisub
 }
 
 pkg_postinst() {

diff --git a/media-video/aegisub/files/3.4.0/Fix-build-without-pch.patch 
b/media-video/aegisub/files/3.4.0/Fix-build-without-pch.patch
new file mode 100644
index 000000000000..2f88b130c975
--- /dev/null
+++ b/media-video/aegisub/files/3.4.0/Fix-build-without-pch.patch
@@ -0,0 +1,229 @@
+From c5e3d6e927e638796b7d0862f6a0c4e19e9fbe6b Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <[email protected]>
+Date: Fri, 27 Dec 2024 20:26:36 +0900
+Subject: [PATCH] Fix build without PCH
+
+Signed-off-by: Nick Sarnie <[email protected]>
+---
+ libaegisub/ass/uuencode.cpp             | 2 +-
+ libaegisub/audio/provider_dummy.cpp     | 1 +
+ libaegisub/common/cajun/reader.cpp      | 1 +
+ libaegisub/common/calltip_provider.cpp  | 2 +-
+ libaegisub/common/mru.cpp               | 2 +-
+ libaegisub/common/option.cpp            | 1 +
+ libaegisub/common/thesaurus.cpp         | 1 +
+ libaegisub/include/libaegisub/lua/ffi.h | 1 +
+ libaegisub/lua/modules/unicode.cpp      | 2 +-
+ libaegisub/unix/path.cpp                | 2 ++
+ src/aegisublocale.cpp                   | 2 ++
+ src/audio_timing_dialogue.cpp           | 2 ++
+ src/base_grid.h                         | 2 ++
+ src/command/command.h                   | 1 +
+ src/frame_main.cpp                      | 2 +-
+ src/preferences.cpp                     | 1 +
+ 16 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/libaegisub/ass/uuencode.cpp b/libaegisub/ass/uuencode.cpp
+index 893268d07..ee5441144 100644
+--- a/libaegisub/ass/uuencode.cpp
++++ b/libaegisub/ass/uuencode.cpp
+@@ -17,7 +17,7 @@
+ #include <libaegisub/ass/uuencode.h>
+ 
+ #include <algorithm>
+-
++#include <cstring>
+ // Despite being called uuencoding by ass_specs.doc, the format is actually
+ // somewhat different from real uuencoding.  Each 3-byte chunk is split into 4
+ // 6-bit pieces, then 33 is added to each piece. Lines are wrapped after 80
+diff --git a/libaegisub/audio/provider_dummy.cpp 
b/libaegisub/audio/provider_dummy.cpp
+index 3e7f104ef..1de35b2b6 100644
+--- a/libaegisub/audio/provider_dummy.cpp
++++ b/libaegisub/audio/provider_dummy.cpp
+@@ -18,6 +18,7 @@
+ 
+ #include "libaegisub/fs.h"
+ 
++#include <cstring>
+ #include <random>
+ 
+ /*
+diff --git a/libaegisub/common/cajun/reader.cpp 
b/libaegisub/common/cajun/reader.cpp
+index 6f32d2ff4..0c69ef9c2 100644
+--- a/libaegisub/common/cajun/reader.cpp
++++ b/libaegisub/common/cajun/reader.cpp
+@@ -9,6 +9,7 @@ Author: Terry Caton
+ #include "libaegisub/cajun/reader.h"
+ 
+ #include <boost/interprocess/streams/bufferstream.hpp>
++#include <algorithm>
+ #include <cassert>
+ 
+ /*
+diff --git a/libaegisub/common/calltip_provider.cpp 
b/libaegisub/common/calltip_provider.cpp
+index de693e637..d24d6277a 100644
+--- a/libaegisub/common/calltip_provider.cpp
++++ b/libaegisub/common/calltip_provider.cpp
+@@ -19,7 +19,7 @@
+ #include "libaegisub/ass/dialogue_parser.h"
+ 
+ #include <algorithm>
+-
++#include <cstring>
+ namespace {
+ struct proto_lit {
+       const char *name;
+diff --git a/libaegisub/common/mru.cpp b/libaegisub/common/mru.cpp
+index 81db2715a..ef2a06944 100644
+--- a/libaegisub/common/mru.cpp
++++ b/libaegisub/common/mru.cpp
+@@ -21,7 +21,7 @@
+ #include "libaegisub/log.h"
+ #include "libaegisub/option.h"
+ #include "libaegisub/option_value.h"
+-
++#include <algorithm>
+ namespace {
+ std::string_view mru_names[] = {
+       "Audio",
+diff --git a/libaegisub/common/option.cpp b/libaegisub/common/option.cpp
+index 13e93a3a0..c90ae9c46 100644
+--- a/libaegisub/common/option.cpp
++++ b/libaegisub/common/option.cpp
+@@ -26,6 +26,7 @@
+ #include "libaegisub/option_value.h"
+ 
+ #include <boost/interprocess/streams/bufferstream.hpp>
++#include <algorithm>
+ #include <cassert>
+ #include <memory>
+ 
+diff --git a/libaegisub/common/thesaurus.cpp b/libaegisub/common/thesaurus.cpp
+index 23366e82c..6626316d9 100644
+--- a/libaegisub/common/thesaurus.cpp
++++ b/libaegisub/common/thesaurus.cpp
+@@ -20,6 +20,7 @@
+ #include "libaegisub/split.h"
+ 
+ #include <boost/interprocess/streams/bufferstream.hpp>
++#include <algorithm>
+ 
+ namespace agi {
+ 
+diff --git a/libaegisub/include/libaegisub/lua/ffi.h 
b/libaegisub/include/libaegisub/lua/ffi.h
+index 17cf0088d..29902f77a 100644
+--- a/libaegisub/include/libaegisub/lua/ffi.h
++++ b/libaegisub/include/libaegisub/lua/ffi.h
+@@ -17,6 +17,7 @@
+ #include <libaegisub/type_name.h>
+ 
+ #include <cstdlib>
++#include <cstring>
+ #include <lua.hpp>
+ 
+ namespace agi::lua {
+diff --git a/libaegisub/lua/modules/unicode.cpp 
b/libaegisub/lua/modules/unicode.cpp
+index 9ee64b114..7f700918b 100644
+--- a/libaegisub/lua/modules/unicode.cpp
++++ b/libaegisub/lua/modules/unicode.cpp
+@@ -17,7 +17,7 @@
+ #include <libaegisub/lua/ffi.h>
+ 
+ #include <unicode/unistr.h>
+-
++#include <cstring>
+ namespace {
+ char *wrap(void (*fn)(icu::UnicodeString&), const char *str, char **err) {
+       auto ustr = icu::UnicodeString::fromUTF8(str);
+diff --git a/libaegisub/unix/path.cpp b/libaegisub/unix/path.cpp
+index a171bc2a4..5a33bf68b 100644
+--- a/libaegisub/unix/path.cpp
++++ b/libaegisub/unix/path.cpp
+@@ -21,6 +21,8 @@
+ 
+ #include <pwd.h>
+ 
++#include "../acconf.h"
++
+ #ifndef __APPLE__
+ #include <fstream>
+ #include <stdlib.h>
+diff --git a/src/aegisublocale.cpp b/src/aegisublocale.cpp
+index cc5f4e10d..754d867d7 100644
+--- a/src/aegisublocale.cpp
++++ b/src/aegisublocale.cpp
+@@ -38,6 +38,8 @@
+ #include "options.h"
+ #include "utils.h"
+ 
++#include "../acconf.h"
++
+ #include <libaegisub/path.h>
+ 
+ #include <algorithm>
+diff --git a/src/audio_timing_dialogue.cpp b/src/audio_timing_dialogue.cpp
+index fd15582b1..9ca06eff5 100644
+--- a/src/audio_timing_dialogue.cpp
++++ b/src/audio_timing_dialogue.cpp
+@@ -39,6 +39,8 @@
+ #include "selection_controller.h"
+ #include "utils.h"
+ 
++#include <list>
++
+ #include <libaegisub/ass/time.h>
+ 
+ #include <boost/range/algorithm.hpp>
+diff --git a/src/base_grid.h b/src/base_grid.h
+index 2f28a21dc..017d8b35c 100644
+--- a/src/base_grid.h
++++ b/src/base_grid.h
+@@ -32,6 +32,8 @@
+ #include <memory>
+ #include <string>
+ #include <vector>
++#include <wx/brush.h>
++#include <wx/scrolbar.h>
+ #include <wx/window.h>
+ 
+ namespace agi {
+diff --git a/src/command/command.h b/src/command/command.h
+index c90b230a0..b9582630b 100644
+--- a/src/command/command.h
++++ b/src/command/command.h
+@@ -17,6 +17,7 @@
+ /// @ingroup command
+ 
+ #include <map>
++#include <memory>
+ #include <string>
+ #include <vector>
+ 
+diff --git a/src/frame_main.cpp b/src/frame_main.cpp
+index 24ef314d7..e81c07761 100644
+--- a/src/frame_main.cpp
++++ b/src/frame_main.cpp
+@@ -67,7 +67,7 @@
+ #include <wx/sizer.h>
+ #include <wx/statline.h>
+ #include <wx/sysopt.h>
+-
++#include <wx/toolbar.h>
+ enum {
+       ID_APP_TIMER_STATUSCLEAR = 12002
+ };
+diff --git a/src/preferences.cpp b/src/preferences.cpp
+index 1b0033b05..ccc52a905 100644
+--- a/src/preferences.cpp
++++ b/src/preferences.cpp
+@@ -47,6 +47,7 @@
+ 
+ #include <wx/checkbox.h>
+ #include <wx/combobox.h>
++#include <wx/dc.h>
+ #include <wx/event.h>
+ #include <wx/listctrl.h>
+ #include <wx/msgdlg.h>
+-- 
+2.45.2
+

diff --git a/media-video/aegisub/files/3.4.0/Use-generated-git-version.patch 
b/media-video/aegisub/files/3.4.0/Use-generated-git-version.patch
new file mode 100644
index 000000000000..ebee2aa3cd4f
--- /dev/null
+++ b/media-video/aegisub/files/3.4.0/Use-generated-git-version.patch
@@ -0,0 +1,20 @@
+diff --git a/tools/version.sh b/tools/version.sh
+index 8df33e175..1293d1578 100755
+--- a/tools/version.sh
++++ b/tools/version.sh
+@@ -3,7 +3,6 @@ srcdir="$2"
+ 
+ # If no git repo try to read from the existing git_version.h, for building 
from tarballs
+ version_h_path="${builddir}/git_version.h"
+-if ! test -d "${srcdir}/.git"; then
+   if test -f "${version_h_path}"; then
+     while read line; do
+       set -- $line
+@@ -19,7 +18,6 @@ if ! test -d "${srcdir}/.git"; then
+     echo "git repo not found and no cached git_version.h"
+     exit 2
+   fi
+-fi
+ osx_bundle_sed_path="${builddir}/osx-bundle.sed"
+ 
+ last_svn_revision=6962

diff --git a/media-video/aegisub/files/3.4.0/git_version.h 
b/media-video/aegisub/files/3.4.0/git_version.h
new file mode 100644
index 000000000000..1e0344e9ca99
--- /dev/null
+++ b/media-video/aegisub/files/3.4.0/git_version.h
@@ -0,0 +1,5 @@
+#define BUILD_GIT_VERSION_NUMBER 340
+#define BUILD_GIT_VERSION_STRING "3.4.0"
+#define TAGGED_RELEASE 0
+#define INSTALLER_VERSION "0.0.0"
+#define RESOURCE_BASE_VERSION 0, 0, 0

diff --git a/media-video/aegisub/files/9999/git_version.h 
b/media-video/aegisub/files/9999/git_version.h
new file mode 100644
index 000000000000..b015ecba42ec
--- /dev/null
+++ b/media-video/aegisub/files/9999/git_version.h
@@ -0,0 +1,5 @@
+#define BUILD_GIT_VERSION_NUMBER 9999
+#define BUILD_GIT_VERSION_STRING "9999"
+#define TAGGED_RELEASE 0
+#define INSTALLER_VERSION "0.0.0"
+#define RESOURCE_BASE_VERSION 0, 0, 0

diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml
index 331bf705f1d7..91d2b087b736 100644
--- a/media-video/aegisub/metadata.xml
+++ b/media-video/aegisub/metadata.xml
@@ -9,7 +9,7 @@
                <flag name="uchardet">Enable charset discovery via 
<pkg>app-i18n/uchardet</pkg></flag>
        </use>
        <upstream>
-               <bugs-to>https://github.com/wangqr/Aegisub/issues</bugs-to>
-               <remote-id type="github">wangqr/Aegisub</remote-id>
+               
<bugs-to>https://github.com/TypesettingTools/Aegisub/issues</bugs-to>
+               <remote-id type="github">TypesettingTools/Aegisub</remote-id>
        </upstream>
 </pkgmetadata>

Reply via email to