Applied sub slot operators on media-libs/ffmpegsource dependency, prevented EGIT_SOURCEDIR and S variables from looping in 9999 ebuild; proxied commit for Nikoli.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 24 insertions, 18 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/Manifest b/media-video/aegisub/Manifest
index ce2bb867dafc..7a59c2ae22ce 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -6,18 +6,18 @@ DIST aegisub-3.0.3.tar.xz 4154764 SHA256 9623e1967ae774d8a34fae531dcf76f15ae060f
 DIST aegisub-3.0.4.tar.xz 4155728 SHA256 7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a SHA512 2917195a61d16578a83ce0b69006dd0269c086c6eff2f622c47d9880697e4e531a7c0c0232c187f9023635c9d3857a1d6a0cee4f6251e49d22e2b625ac5dda7f WHIRLPOOL 60bd3e0374a60f6af62fe450488e8c68e18957283fff59d704f40e192da624bdf90d68c3cea41122e5b9ca440d218c3bd6d9d8091ed5226a2e9d1b9fdc2ce689
 EBUILD aegisub-2.1.9.ebuild 1420 SHA256 3b3a2e81ff1eff2491c2070a07249ced0b1c39e4df89f8052358a25001198636 SHA512 b8bc094c3d8b5342a02fafafa21faac625cc3509abe3dbc90f9fcd115e443ac7e9532cf0c488e60575a718d13b1cee4056c3e7570c5af6215b078ddc7491fe34 WHIRLPOOL 9cd3bc967c78fa0cb67c8a3df954d9bfab15323aafef2eee8b3b8c33560a27c0d4d8ffed9f10ecc83699990ab0ca3d98406816d5f6258dc47aef11123bc54104
 EBUILD aegisub-3.0.3.ebuild 1643 SHA256 c96512ddebebccbe0250956a839e2f41008bf27e7be90a24ddaf038f2e2242bc SHA512 097c5097f8a8d62699b526f92309a918919ab70aab724a519761d30b2146a25c94dfe241de47a65f5ac1540ca45c92f82647cd473339cfa321997eb9d4b99f34 WHIRLPOOL d7cce217dfda5f540f587b0425487a1587c71d1549c097462a6a62ca2aeef881f1f758d6f99c6e629e569a9aaeba1d3cc6314831411afdd55dffb976a0b1ced3
-EBUILD aegisub-3.0.4.ebuild 1645 SHA256 e7e26654c4c8593ba12cdc9fb913c0c8f5141b9b468e312b2b45173a8e94f103 SHA512 82500dc13caf4d57694543b116671b9cf46509e54446f15241f43c1fd8628b26b404ec8e06c706bf7206a99859e8ac0d78caedd1b6858b5886595dc56eb167e5 WHIRLPOOL 48ec613fe6799798132e7d55dc8c2ddbf9be0ce03fec74dd5570c05387bc800ab1281d7b79ab0e169f578ca81a46322757be2ec844fda32bcceba0654277cc1c
-EBUILD aegisub-9999.ebuild 1644 SHA256 f295326cf5e2f5e4a3fb0a74dee1d073332def853accf7875d8a6ecbfd4bf136 SHA512 82803b293533d54d61a79c84d82cda8862be1b63889283a6161fec04dfa80905fb0246de26a57668f2d38dc90a0e055b355b3f671b581cee21294c991ed7d0de WHIRLPOOL 7fd092ad7058a7e54473d7c4e54690108418ae1ed7fd51721ac2fa1d2749545c8c80442a83c524840ed20d5fd554e73d3da37c5c94561485c4db6743d77ab40c
-MISC ChangeLog 1878 SHA256 fc18f613c37107ab159aabaeeb2cc89c9e94abe73dba15268d033da1a6814e90 SHA512 745caae059c6dc714305efad4596031ccceb0ff1b93c19a362c1393ca1e110e2cd7fe4e9491ee710878e4204b21e2d45f9ed5a3c1cdfe1d6ed7c20759c06163c WHIRLPOOL 8e51f6c4efef71e232e677344dd5a5ebce85247712a76d24e6064e9db0246bfff0fe974df9ab0f4932ca1e99048c2c77637b028e20489e9cf4365d8508124c52
+EBUILD aegisub-3.0.4.ebuild 1645 SHA256 4fa6c1c2801de2f52a9b005ea5b2dab26f81c9c3119cc7465e3614b85d7a0af4 SHA512 654cb0620537ff5ff283a5f9477a23480f54e5bd353c17cc55c0355bc1d7c7bd06b0f0463ccc8366db862a4ae3f0c0799ac797436c4981dc45ebcff3eb9e86c2 WHIRLPOOL 606db55abe594412259e9dc640591a28daedcc4eb81b3b878c3fbf6f3233de3c03e9bc15e60e907055289c5b804e889e30566c93440c76e8d665f0b97c7015cc
+EBUILD aegisub-9999.ebuild 1668 SHA256 092ad3cdce687cb556a628ebc57591f4590ed758fe55968b3a099730c4a8fb27 SHA512 92d1e4cd1e848d79634ebdf5c3f9926250b8e941d6d76685b8ebd6e990817c83b9890d1fa9ce5cadf88a90444eb6e0407bbd3d08e447951d0e70724135c4da01 WHIRLPOOL b1ea3bb443cb8fc90837e057b7956bd5d2e8b54d59ad598c06ccee6d9f08b53b8e3d370693034eb7812b7019f3322af31508941d525f47f448a9a4601c15ea9b
+MISC ChangeLog 2152 SHA256 6b8bcfd13eb093b47317c3b457a2b38651d47d6698f0d1cf1c58de3487dee68c SHA512 20a9eec061b5392da471a20496360418efc37fbffc8016a8f98100a4471028be67aad288e5eac14cdbe56a19bb0cdb12eb775fc0b928de9d3a59ea60ac5c3404 WHIRLPOOL a8a4e7f1816b1a95761124ea0d71997119ca01338675733b0de2ea5b199eb26de99696448bf81746ff8f7240f0400bb25307588c8498210b1c09a6764dafccc5
 MISC metadata.xml 349 SHA256 0588fe8b44502f319e8de7916d53b7788ec564ce2dd9e98a1929cf17b8829e84 SHA512 bc6e78cadc8556804a2db10804a866c5860c3e4618c49faf6e9c36bccf24c4045bcd365e7ead0519c183fa8cabf7ea98d13d14103c01cbd9d3d426054659e07b WHIRLPOOL 6e6762daacc936b4466e78f559b5b8ad4e2a9cb959193a5b953fb25a8ce0d8bf65ab17cca6b55720a3bd67013610d88f192bb25c74abbf2e29929b620307960b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSUrN/AAoJECo/aRed9267+oMIAJ0zzCjPgp2F28PN0YctNR/z
-KMS5D5H3JSIRp73qPGQikXSg4EyQEG90fL0BFUkT/4y3ICcEok5kghPGZR0HtjO9
-TZ60gM5eAft1tZ/2UvqEtwZibSlfeYT1Z5cWKkv/+TgddD072dgsD2i3hcAMJqeM
-g4FzxCOgMyqwfa3O8Fv+YEIEMhl5btk0citaKBZp54Zr+hDQ0Wi7dQRhVU8iWET4
-5bXZoh/pS5Q+8nnibf37xZ3R1CDtmb0pH0N7oE2gl2SNSHyQOgBDbUpIfuEe0J3O
-5GiB3i/PSURP9JXznfEu71fLy1sOVWswt83ntih7TihdwXMjlAMGr3SmrSdrONw=
-=OHJa
+iQEcBAEBCAAGBQJSWs0qAAoJEJWyH81tNOV9NaEH/00kH7nC3BJDNatLNKSWafxh
+RtYg+04O/lhvrB9YfG32EAb2Fkuuib3nhra/kap7aThHg39i48k3EY6hkG7XgAv9
+odHQYvk5+neXGGLkOUwLbl9200pejySz3ZY8fo8Wp3WlSOPalUEV7Wy2Ppw50Z1E
+lURYwtt8/2WeWFVIU3eqNIP36Z7O5fwqt7+BtVifgPXLOxhOVSKeo+z+zeWFcoGz
+ZHw/6zQsfjQ6KbFAG/62VS3yZXf6Nf4+U0gGrm6IQWk6ER+S3CCoTgTVllfpFXRE
+Bl4dZs/Q9YS6J41NpCe7LNFbeQKqwkmR0B0sDCmeaB+X3XR6SEXXpagQFqp0d7Y=
+=qtQ1
 -----END PGP SIGNATURE-----
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=(