diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-10-13 16:41:10 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-10-13 16:41:10 +0000 |
| commit | 7286290630e1de3bfad5d1d1becce8ba28c7a03a (patch) | |
| tree | a00a8912a4a2add2c15e4b5f23cd41636d277d67 | |
| parent | Version bump to 2.19. Subslot due to changed soname, HOMEPAGE / SRC_URI chang... (diff) | |
| download | gentoo-2-7286290630e1de3bfad5d1d1becce8ba28c7a03a.tar.gz gentoo-2-7286290630e1de3bfad5d1d1becce8ba28c7a03a.tar.bz2 gentoo-2-7286290630e1de3bfad5d1d1becce8ba28c7a03a.zip | |
Applied sub slot operators on media-libs/ffmpegsource dependency, prevented EGIT_SOURCEDIR and S variables from looping in 9999 ebuild; proxied commit for Nikoli.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
| -rw-r--r-- | media-video/aegisub/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/aegisub/aegisub-3.0.4.ebuild | 4 | ||||
| -rw-r--r-- | media-video/aegisub/aegisub-9999.ebuild | 8 |
3 files changed, 13 insertions, 7 deletions
diff --git a/media-video/aegisub/ChangeLog b/media-video/aegisub/ChangeLog index 953fcecc161b..b24d7272aef4 100644 --- a/media-video/aegisub/ChangeLog +++ b/media-video/aegisub/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/aegisub # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/ChangeLog,v 1.10 2013/10/07 13:13:28 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/ChangeLog,v 1.11 2013/10/13 16:41:10 tomwij Exp $ + + 13 Oct 2013; Tom Wijsman <TomWij@gentoo.org> aegisub-3.0.4.ebuild, + aegisub-9999.ebuild, metadata.xml: + Applied sub slot operators on media-libs/ffmpegsource dependency, prevented + EGIT_SOURCEDIR and S variables from looping in 9999 ebuild; proxied commit for + Nikoli. *aegisub-3.0.4 (07 Oct 2013) diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4.ebuild index 8a3b640bc0ec..61f9a32741a2 100644 --- a/media-video/aegisub/aegisub-3.0.4.ebuild +++ b/media-video/aegisub/aegisub-3.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-3.0.4.ebuild,v 1.1 2013/10/07 13:13:28 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-3.0.4.ebuild,v 1.2 2013/10/13 16:41:10 tomwij Exp $ EAPI="5" @@ -39,7 +39,7 @@ RDEPEND=" lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2.2 ) - ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) + ffmpeg? ( >=media-libs/ffmpegsource-2.17:= ) fftw? ( >=sci-libs/fftw-3.3 ) " DEPEND="${RDEPEND} diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild index 30395487ec54..f619d13feeb8 100644 --- a/media-video/aegisub/aegisub-9999.ebuild +++ b/media-video/aegisub/aegisub-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-9999.ebuild,v 1.1 2013/04/01 13:54:09 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-9999.ebuild,v 1.2 2013/10/13 16:41:10 tomwij Exp $ EAPI="5" @@ -39,7 +39,7 @@ RDEPEND=" lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2.2 ) - ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) + ffmpeg? ( >=media-libs/ffmpegsource-2.17:= ) fftw? ( >=sci-libs/fftw-3.3 ) " DEPEND="${RDEPEND} @@ -49,8 +49,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig " -EGIT_SOURCEDIR="${S}" -S=${S}/${PN} +EGIT_SOURCEDIR="${WORKDIR}/${P}" +S="${WORKDIR}/${P}/${PN}" src_configure() { local myeconfargs=( |