ssuominen 14/03/11 19:11:24
Modified: abcde-2.5.2.ebuild abcde-2.5.4-r1.ebuild
abcde-2.5.4.ebuild ChangeLog
Log:
Use || ( ) to allow installation of media-video/atomicparsley-wez instead of
media-video/atomicparsley wrt #504232
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key
4868F14D)
Revision Changes Path
1.8 media-sound/abcde/abcde-2.5.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/abcde-2.5.2.ebuild?rev=1.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/abcde-2.5.2.ebuild?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/abcde-2.5.2.ebuild?r1=1.7&r2=1.8
Index: abcde-2.5.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- abcde-2.5.2.ebuild 25 Nov 2012 09:32:49 -0000 1.7
+++ abcde-2.5.2.ebuild 11 Mar 2014 19:11:24 -0000 1.8
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.2.ebuild,v 1.7
2012/11/25 09:32:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.2.ebuild,v 1.8
2014/03/11 19:11:24 ssuominen Exp $
EAPI=4
inherit eutils
@@ -20,7 +20,7 @@
virtual/eject
aac? (
media-libs/faac
- media-video/atomicparsley
+ || ( media-video/atomicparsley media-video/atomicparsley-wez )
)
cdparanoia? ( media-sound/cdparanoia )
flac? ( media-libs/flac )
1.3 media-sound/abcde/abcde-2.5.4-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/abcde-2.5.4-r1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/abcde-2.5.4-r1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/abcde-2.5.4-r1.ebuild?r1=1.2&r2=1.3
Index: abcde-2.5.4-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.4-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- abcde-2.5.4-r1.ebuild 3 Feb 2013 19:33:51 -0000 1.2
+++ abcde-2.5.4-r1.ebuild 11 Mar 2014 19:11:24 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.4-r1.ebuild,v
1.2 2013/02/03 19:33:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.4-r1.ebuild,v
1.3 2014/03/11 19:11:24 ssuominen Exp $
EAPI=5
inherit eutils
@@ -21,7 +21,7 @@
virtual/eject
aac? (
media-libs/faac
- media-video/atomicparsley
+ || ( media-video/atomicparsley media-video/atomicparsley-wez )
)
cdparanoia? (
|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
1.5 media-sound/abcde/abcde-2.5.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/abcde-2.5.4.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/abcde-2.5.4.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/abcde-2.5.4.ebuild?r1=1.4&r2=1.5
Index: abcde-2.5.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- abcde-2.5.4.ebuild 10 Mar 2014 17:32:31 -0000 1.4
+++ abcde-2.5.4.ebuild 11 Mar 2014 19:11:24 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.4.ebuild,v 1.4
2014/03/10 17:32:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/abcde-2.5.4.ebuild,v 1.5
2014/03/11 19:11:24 ssuominen Exp $
EAPI=5
@@ -20,7 +20,7 @@
virtual/eject
aac? (
media-libs/faac
- media-video/atomicparsley
+ || ( media-video/atomicparsley media-video/atomicparsley-wez )
)
cdparanoia? (
|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
1.70 media-sound/abcde/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/ChangeLog?rev=1.70&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/ChangeLog?rev=1.70&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/abcde/ChangeLog?r1=1.69&r2=1.70
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog 10 Mar 2014 17:32:31 -0000 1.69
+++ ChangeLog 11 Mar 2014 19:11:24 -0000 1.70
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/abcde
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.69
2014/03/10 17:32:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/abcde/ChangeLog,v 1.70
2014/03/11 19:11:24 ssuominen Exp $
+
+ 11 Mar 2014; Samuli Suominen <[email protected]> abcde-2.5.2.ebuild,
+ abcde-2.5.4-r1.ebuild, abcde-2.5.4.ebuild:
+ Use || ( ) to allow installation of media-video/atomicparsley-wez instead of
+ media-video/atomicparsley wrt #504232
10 Mar 2014; Samuli Suominen <[email protected]> abcde-2.5.4.ebuild:
Force exactly 0.6.18 (-r0, not -r1) of dev-python/eyeD3 for the old 0.6
series
