summaryrefslogtreecommitdiff
path: root/media-video/aegisub
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-06-16 21:23:20 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-06-16 21:23:20 +0100
commitfab849d1daed0ba7f2ac497d07985c3dbb692543 (patch)
tree10baa743a5340b42ad538dd19d48669ccac209b1 /media-video/aegisub
parent73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff)
gentoo resync : 16.06.2019
Diffstat (limited to 'media-video/aegisub')
-rw-r--r--media-video/aegisub/Manifest4
-rw-r--r--media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild4
-rw-r--r--media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch8
3 files changed, 8 insertions, 8 deletions
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index c8f51c107430..d13770c28cf1 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -2,8 +2,8 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu59-build.patch 496 BLAKE2B 33
AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-icu62-build.patch 2369 BLAKE2B edbada9d9bb3fbd4ffcd3f8f6aa640132163e0127baada7d40eb39312479602cf57b80e9314b8d3a92aff74764a9ed8336b055cf9c2d387c27595553f1f01185 SHA512 7963b76652126e1aa574e89f56c09e6008afd745c9198a2b081ed65c8697a15cbd7e611d6aeae0e2513b0eb79409665fd78885ef3599ff6f0d074b42bb461a8a
AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-system-luajit-build.patch 4029 BLAKE2B 635bfd2317a05b1393c26b648f0081920be30e9ca29eeac0a5d25b75a141a3eb40cded94d27934eddb4d2ad1f28a1d8752faf97f264cc4a2a4ef0ffaedeed7b4 SHA512 247dba6e593212294f3157226c03e2fb5d3a5a8eaf9a16e0a65ea1fee006b8f21fadbdd80fb0b748be3a9b043779a0da6bb6007fac07b7908fb46f27a055704e
AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-respect-compiler-flags.patch 2186 BLAKE2B 67558c0d8a1227e03d6ab97e4f417ec0ef557609be908b403ea5d4c4b12b58dd33822611b98e42afdbc3e65741094ef52d19812fd4eea5611f12a7e109b0986f SHA512 8584f8b6822642f5afdbe1fb9a1e77b32fa4eefebb473d6a501147d328ca38ecb2f88f4247a7ad06a8dfe3d9cc6695f60652dbc122237a17d097bae2f29a6a7e
-AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2483 BLAKE2B 6bff0828e0678e269dc129be03f9bf1135933abefdb9190de5fe6afd214b9caa8b4283f65f30853b3ae118c5ade021a174fa164cee606b635f6587deabf47581 SHA512 802ee218e2c005760a8260271791df0891ef6392bec4fbbb5936df5a84db888b0b6f36055d0760c4929cb442adcc1433a363fa93eae6c163f296166028684daf
+AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2446 BLAKE2B 5b1a5556829fbcd5d10ad869af5dcce4c6227dbc9d460094f237448a4aac9e07a9752039ab857a3556d062297cd0101e71ace0b4d3643f481e7479f16ccdf2e3 SHA512 f5171353ac14806166e26c4b335e6c7d9e111ba1eb68c3160fc9f802e1e3de659df48c4be180a0a25c67f7733007c8875c191436314ccfc9d7696a1f8a1fa719
DIST aegisub-3.2.2_p20160518.tar.gz 7438734 BLAKE2B 3a57e5d6fafac2ca95d64d60e8d68b48177aaa0c5fd1438d0b0a133757ef95443c16324fb7effb41506f2b1eb70aab9d34845a91beef0ef81a3658444e24be07 SHA512 8d8775ba0a12735a9756b9abfd65c89519dae4e21afcaedbd18985d1c1021975b1ae909b3bef1121b707c626e1711d56f1823f3b4746eab49e8386536a5e84e6
-EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3526 BLAKE2B a38d02662aa047b7f9d505391a25be856d50267c9d917a9df7342b1afaec5122f22a4649d0ac8adfb2259eb0c01bbab1681c138280db191782711d4bd32436ef SHA512 b657555a4f49c09b9c06570dd9927a136b1341ef8ae5cd209ec73ce45a62e33fcd15fbf90b8a870f6a68f071b3e322e03fcd17f8fdfc04b1579a64b19bfea0cb
+EBUILD aegisub-3.2.2_p20160518-r2.ebuild 3524 BLAKE2B 0cabead7524421c8eb0aef0aaa420257bde80b91f472caa10a1974eb62cf618e18929d6b834976f35e11961cf608138481172b8c4a1eb95b3fd4a0d22641ea51 SHA512 75d0d42d3cba04d06e866ce4717fa6cc4382f092edcd6d3e765038d6341785731fc23de961c2bf3b0688e1b768bbc4025f441b2f3c5fe4d92c1bf53e87ac2187
EBUILD aegisub-9999.ebuild 2867 BLAKE2B 9eeddc22c8774b94d0365b8f0b628f4cde96847f90d1373e26cedd4ae74662b04407858b71d2de9f44b67f444651513ae95b13743eb5c2157e6f9daa00f4af96 SHA512 afce1fa2d15e8a63bff8551e88338aa5d01093aa61ccd84105f2c0200dcefeeeadd0a4535d9e176ab39043d842e272abecaff2d7113f77f9f36354788e3c021e
MISC metadata.xml 489 BLAKE2B b26abe2056ef0465a81ea8f9928c6d05053595b5650aff750251173ddce6f5248a30331104710c1b05cafe9641c072764c45f66935b25857785bc833af31174a SHA512 450c45be100ed72d7f0b69fe596862137ea2f421597e99129325bf2f58940600a62e1502ee4d6c7cbbab17b4cbd99da8c481ceb6fec2709452c17d8cb7aaae48
diff --git a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
index d5b623eb234e..bef93fffa85b 100644
--- a/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig
test? (
- ~dev-cpp/gtest-1.7.0
+ >=dev-cpp/gtest-1.8.1
dev-lua/busted
dev-lua/luarocks
)
diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch
index 8209ac5ec7c3..7e3fac2acd81 100644
--- a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch
+++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch
@@ -24,13 +24,13 @@ index 8c30c1d..c5bf049 100644
GTEST_ROOT ?= $(TOP)vendor/googletest
GTEST_FILE := ${GTEST_ROOT}/src/gtest-all
+GTEST_CPPFLAGS := -I$(GTEST_ROOT) -I$(GTEST_ROOT)/include
-+GTEST_CXXFLAGS := $(CFLAGS_PTHREAD)
+GTEST_LIBS := $(LIBS_PTHREAD)
+else
-+GTEST_CPPFLAGS := $(shell gtest-config --cppflags)
-+GTEST_CXXFLAGS := $(shell gtest-config --cxxflags)
-+GTEST_LIBS := $(shell gtest-config --libs)
++GTEST_CPPFLAGS := $(shell pkg-config --cflags-only-I gtest)
++GTEST_LIBS := $(shell pkg-config --libs gtest)
+endif
++
++GTEST_CXXFLAGS := $(CFLAGS_PTHREAD)
run_PCH := $(d)support/tests_pre.h
run_CPPFLAGS := -I$(TOP)libaegisub/include -I$(TOP) -I$(d)support \