Gentoo Archives: gentoo-commits

From: Ian Delaney <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/, media-video/aegisub/files/
Date: Tue, 08 Mar 2016 02:17:00
Message-Id: 1457375704.591bb17a3b4c3461add4ba29cbf996958fd0d3e2.idella4@gentoo
1 commit: 591bb17a3b4c3461add4ba29cbf996958fd0d3e2
2 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
3 AuthorDate: Mon Mar 7 15:43:14 2016 +0000
4 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 7 18:35:04 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=591bb17a
7
8 media-video/aegisub: remove old
9
10 Package-Manager: portage-2.2.27
11
12 media-video/aegisub/aegisub-3.2.2-r1.ebuild | 119 ---------------------
13 ...isub-3.2.2-r1-respect-user-compiler-flags.patch | 53 ---------
14 2 files changed, 172 deletions(-)
15
16 diff --git a/media-video/aegisub/aegisub-3.2.2-r1.ebuild b/media-video/aegisub/aegisub-3.2.2-r1.ebuild
17 deleted file mode 100644
18 index 79bc20d..0000000
19 --- a/media-video/aegisub/aegisub-3.2.2-r1.ebuild
20 +++ /dev/null
21 @@ -1,119 +0,0 @@
22 -# Copyright 1999-2016 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -# $Id$
25 -
26 -EAPI=5
27 -
28 -AUTOTOOLS_AUTORECONF=1
29 -AUTOTOOLS_IN_SOURCE_BUILD=1
30 -PLOCALES="ar 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@latin sr_RS uk_UA vi zh_CN zh_TW"
31 -WX_GTK_VER="3.0"
32 -
33 -inherit autotools-utils fdo-mime flag-o-matic gnome2-utils l10n wxwidgets
34 -
35 -DESCRIPTION="Advanced subtitle editor"
36 -HOMEPAGE="http://www.aegisub.org/"
37 -SRC_URI="
38 - http://ftp.aegisub.org/pub/releases/${P}.tar.xz
39 - ftp://ftp.aegisub.org/pub/releases/${P}.tar.xz
40 -"
41 -
42 -LICENSE="BSD"
43 -SLOT="0"
44 -KEYWORDS="~amd64 ~x86"
45 -IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
46 -
47 -# configure.ac specifies minimal versions for some of the dependencies below.
48 -# However, most of these minimal versions date back to 2006-2010 yy.
49 -# Such version specifiers are meaningless nowadays, so they are omitted.
50 -RDEPEND="
51 - >=dev-lang/luajit-2.0.3:2[lua52compat]
52 - >=dev-libs/boost-1.50.0:=[icu,nls,threads]
53 - >=dev-libs/icu-4.8.1.1:=
54 - >=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
55 - media-libs/fontconfig
56 - media-libs/freetype
57 - media-libs/libass[fontconfig]
58 - virtual/libiconv
59 - virtual/opengl
60 -
61 - alsa? ( media-libs/alsa-lib )
62 - openal? ( media-libs/openal )
63 - portaudio? ( =media-libs/portaudio-19* )
64 - pulseaudio? ( media-sound/pulseaudio )
65 -
66 - ffmpeg? ( >=media-libs/ffmpegsource-2.16:= )
67 - fftw? ( >=sci-libs/fftw-3.3:= )
68 -
69 - spell? ( app-text/hunspell )
70 -"
71 -DEPEND="${RDEPEND}
72 - oss? ( virtual/os-headers )
73 - dev-util/intltool
74 - sys-devel/gettext
75 - virtual/pkgconfig
76 -"
77 -REQUIRED_USE="
78 - || ( alsa openal oss portaudio pulseaudio )
79 -"
80 -
81 -# aegisub also bundles luabins (https://github.com/agladysh/luabins).
82 -# Unfortunately, luabins upstream is dead since 2011.
83 -# Thus unbundling luabins is not worth the effort.
84 -PATCHES=(
85 - "${FILESDIR}/${P}-fix-lua-regexp.patch"
86 - "${FILESDIR}/${P}-unbundle-luajit.patch"
87 - "${FILESDIR}/${P}-add-missing-pthread-flags.patch"
88 - "${FILESDIR}/${PF}-respect-user-compiler-flags.patch"
89 -)
90 -
91 -pkg_pretend() {
92 - if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
93 - die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3."
94 - fi
95 -}
96 -
97 -src_prepare() {
98 - cp /usr/share/gettext/config.rpath . || die
99 -
100 - remove_locale() {
101 - rm "po/${1}.po" || die
102 - }
103 -
104 - l10n_find_plocales_changes 'po' '' '.po'
105 - l10n_for_each_disabled_locale_do remove_locale
106 -
107 - autotools-utils_src_prepare
108 -}
109 -
110 -src_configure() {
111 - # Prevent sandbox violation from OpenAL detection. Gentoo bug #508184.
112 - use openal && export agi_cv_with_openal="yes"
113 - local myeconfargs=(
114 - --disable-update-checker
115 - $(use_enable debug)
116 - $(use_with alsa)
117 - $(use_with ffmpeg ffms2)
118 - $(use_with fftw fftw3)
119 - $(use_with openal)
120 - $(use_with oss)
121 - $(use_with portaudio)
122 - $(use_with pulseaudio libpulse)
123 - $(use_with spell hunspell)
124 - )
125 - autotools-utils_src_configure
126 -}
127 -
128 -pkg_preinst() {
129 - gnome2_icon_savelist
130 -}
131 -
132 -pkg_postinst() {
133 - fdo-mime_desktop_database_update
134 - gnome2_icon_cache_update
135 -}
136 -
137 -pkg_postrm() {
138 - fdo-mime_desktop_database_update
139 - gnome2_icon_cache_update
140 -}
141
142 diff --git a/media-video/aegisub/files/aegisub-3.2.2-r1-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.2.2-r1-respect-user-compiler-flags.patch
143 deleted file mode 100644
144 index 5178983..0000000
145 --- a/media-video/aegisub/files/aegisub-3.2.2-r1-respect-user-compiler-flags.patch
146 +++ /dev/null
147 @@ -1,53 +0,0 @@
148 -http://devel.aegisub.org/ticket/1899
149 -http://devel.aegisub.org/ticket/1900
150 -
151 -diff --git a/configure.ac b/configure.ac
152 -index be657b0..de8184f 100644
153 ---- a/configure.ac
154 -+++ b/configure.ac
155 -@@ -139,20 +139,17 @@ CC="$PTHREAD_CC"
156 - AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
157 -
158 - AS_IF([test x$enable_compiler_flags != xno], [
159 -- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
160 -- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
161 -+ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
162 -+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing"
163 -+ AC_C_FLAG([-std=gnu99])
164 - AC_CXX_FLAG([-std=c++11])
165 -- AC_CXX_FLAG([-Wno-c++11-narrowing])
166 - AC_C_FLAG([-Wno-unused-local-typedefs])
167 - AC_CXX_FLAG([-Wno-unused-local-typedefs])
168 -
169 - # -O* messes with debugging.
170 - AS_IF([test x$enable_debug = xyes], [
171 -- CFLAGS="$CFLAGS -O0"
172 -- CXXFLAGS="$CXXFLAGS -O0"
173 -- ], [
174 -- CFLAGS="$CFLAGS -O3"
175 -- CXXFLAGS="$CXXFLAGS -O3"
176 -+ CFLAGS="$CFLAGS -O0 -g"
177 -+ CXXFLAGS="$CXXFLAGS -O0 -g"
178 - ])
179 - ])
180 -
181 -diff --git a/src/Makefile b/src/Makefile
182 -index 60d7101..1f7b2bc 100644
183 ---- a/src/Makefile
184 -+++ b/src/Makefile
185 -@@ -182,14 +182,13 @@ endif
186 - #####################
187 - # SOURCE-LEVEL CFLAGS
188 - #####################
189 --$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized
190 - $(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
191 - $(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2)
192 - $(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE)
193 - $(d)charset_detect.o_FLAGS := -D_X86_
194 - $(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
195 - $(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS)
196 --$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
197 -+$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS)
198 - $(d)text_file_reader.o_FLAGS := -D_X86_
199 - $(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2)
200 - $(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include