[gentoo-commits] gentoo-x86 commit in media-libs/phonon: phonon-9999.ebuild phonon-4.8.3-r1.ebuild ChangeLog - gentoo-commits

From:	"Johannes Huber (johu)" <johu@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in media-libs/phonon: phonon-9999.ebuild phonon-4.8.3-r1.ebuild ChangeLog
Date:	Tue, 02 Jun 2015 15:53:46
Message-Id:	`20150602155340.B13EAA1B@oystercatcher.gentoo.org`

1

johu        15/06/02 15:53:40

2

3

  Modified:             phonon-9999.ebuild phonon-4.8.3-r1.ebuild ChangeLog

4

  Log:

5

  Fix gentoo-portage-rsync-mirror merge failure.

6

7

  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)

8

9

Revision  Changes    Path

10

1.29                 media-libs/phonon/phonon-9999.ebuild

11

12

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.29&view=markup

13

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.29&content-type=text/plain

14

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?r1=1.28&r2=1.29

15

16

Index: phonon-9999.ebuild

17

===================================================================

18

RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v

19

retrieving revision 1.28

20

retrieving revision 1.29

21

diff -u -r1.28 -r1.29

22

--- phonon-9999.ebuild	2 Jun 2015 07:41:48 -0000	1.28

23

+++ phonon-9999.ebuild	2 Jun 2015 15:53:40 -0000	1.29

24

@@ -1,6 +1,6 @@

25

 # Copyright 1999-2015 Gentoo Foundation

26

 # Distributed under the terms of the GNU General Public License v2

27

-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.28 2015/06/02 07:41:48 mgorny Exp $

28

+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.29 2015/06/02 15:53:40 johu Exp $

29

30

 EAPI=5

31

32

@@ -23,7 +23,6 @@

33

 IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"

34

35

 REQUIRED_USE="

36

-	|| ( aqua gstreamer vlc )

37

 	|| ( qt4 qt5 )

38

 	zeitgeist? ( qt4 )

39

"

1.2                  media-libs/phonon/phonon-4.8.3-r1.ebuild

44

45

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?rev=1.2&view=markup

46

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?rev=1.2&content-type=text/plain

47

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?r1=1.1&r2=1.2

48

49

Index: phonon-4.8.3-r1.ebuild

50

===================================================================

51

RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v

52

retrieving revision 1.1

53

retrieving revision 1.2

54

diff -u -r1.1 -r1.2

55

--- phonon-4.8.3-r1.ebuild	2 Jun 2015 07:41:48 -0000	1.1

56

+++ phonon-4.8.3-r1.ebuild	2 Jun 2015 15:53:40 -0000	1.2

57

@@ -1,6 +1,6 @@

58

 # Copyright 1999-2015 Gentoo Foundation

59

 # Distributed under the terms of the GNU General Public License v2

60

-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v 1.1 2015/06/02 07:41:48 mgorny Exp $

61

+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v 1.2 2015/06/02 15:53:40 johu Exp $

62

63

 EAPI=5

64

65

@@ -23,7 +23,6 @@

66

 IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"

67

68

 REQUIRED_USE="

69

-	|| ( aqua gstreamer vlc )

70

 	|| ( qt4 qt5 )

71

 	zeitgeist? ( qt4 )

72

"

1.76                 media-libs/phonon/ChangeLog

77

78

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.76&view=markup

79

plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.76&content-type=text/plain

80

diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?r1=1.75&r2=1.76

81

82

Index: ChangeLog

83

===================================================================

84

RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v

85

retrieving revision 1.75

86

retrieving revision 1.76

87

diff -u -r1.75 -r1.76

88

--- ChangeLog	2 Jun 2015 07:41:48 -0000	1.75

89

+++ ChangeLog	2 Jun 2015 15:53:40 -0000	1.76

90

@@ -1,6 +1,10 @@

91

 # ChangeLog for media-libs/phonon

92

 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2

93

-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.75 2015/06/02 07:41:48 mgorny Exp $

94

+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.76 2015/06/02 15:53:40 johu Exp $

95

+

96

+  02 Jun 2015; Johannes Huber <johu@g.o> phonon-4.8.3-r1.ebuild,

97

+  phonon-9999.ebuild:

98

+  Fix gentoo-portage-rsync-mirror merge failure.

99

100

 *phonon-4.8.3-r1 (02 Jun 2015)

1	johu 15/06/02 15:53:40
2
3	Modified: phonon-9999.ebuild phonon-4.8.3-r1.ebuild ChangeLog
4	Log:
5	Fix gentoo-portage-rsync-mirror merge failure.
6
7	(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)
8
9	Revision Changes Path
10	1.29 media-libs/phonon/phonon-9999.ebuild
11
12	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.29&view=markup
13	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?rev=1.29&content-type=text/plain
14	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-9999.ebuild?r1=1.28&r2=1.29
15
16	Index: phonon-9999.ebuild
17	===================================================================
18	RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v
19	retrieving revision 1.28
20	retrieving revision 1.29
21	diff -u -r1.28 -r1.29
22	--- phonon-9999.ebuild 2 Jun 2015 07:41:48 -0000 1.28
23	+++ phonon-9999.ebuild 2 Jun 2015 15:53:40 -0000 1.29
24	@@ -1,6 +1,6 @@
25	# Copyright 1999-2015 Gentoo Foundation
26	# Distributed under the terms of the GNU General Public License v2
27	-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.28 2015/06/02 07:41:48 mgorny Exp $
28	+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.29 2015/06/02 15:53:40 johu Exp $
29
30	EAPI=5
31
32	@@ -23,7 +23,6 @@
33	IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
34
35	REQUIRED_USE="
36	- \|\| ( aqua gstreamer vlc )
37	\|\| ( qt4 qt5 )
38	zeitgeist? ( qt4 )
39	"
40
41
42
43	1.2 media-libs/phonon/phonon-4.8.3-r1.ebuild
44
45	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?rev=1.2&view=markup
46	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?rev=1.2&content-type=text/plain
47	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild?r1=1.1&r2=1.2
48
49	Index: phonon-4.8.3-r1.ebuild
50	===================================================================
51	RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v
52	retrieving revision 1.1
53	retrieving revision 1.2
54	diff -u -r1.1 -r1.2
55	--- phonon-4.8.3-r1.ebuild 2 Jun 2015 07:41:48 -0000 1.1
56	+++ phonon-4.8.3-r1.ebuild 2 Jun 2015 15:53:40 -0000 1.2
57	@@ -1,6 +1,6 @@
58	# Copyright 1999-2015 Gentoo Foundation
59	# Distributed under the terms of the GNU General Public License v2
60	-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v 1.1 2015/06/02 07:41:48 mgorny Exp $
61	+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.3-r1.ebuild,v 1.2 2015/06/02 15:53:40 johu Exp $
62
63	EAPI=5
64
65	@@ -23,7 +23,6 @@
66	IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
67
68	REQUIRED_USE="
69	- \|\| ( aqua gstreamer vlc )
70	\|\| ( qt4 qt5 )
71	zeitgeist? ( qt4 )
72	"
73
74
75
76	1.76 media-libs/phonon/ChangeLog
77
78	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.76&view=markup
79	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?rev=1.76&content-type=text/plain
80	diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/phonon/ChangeLog?r1=1.75&r2=1.76
81
82	Index: ChangeLog
83	===================================================================
84	RCS file: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v
85	retrieving revision 1.75
86	retrieving revision 1.76
87	diff -u -r1.75 -r1.76
88	--- ChangeLog 2 Jun 2015 07:41:48 -0000 1.75
89	+++ ChangeLog 2 Jun 2015 15:53:40 -0000 1.76
90	@@ -1,6 +1,10 @@
91	# ChangeLog for media-libs/phonon
92	# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
93	-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.75 2015/06/02 07:41:48 mgorny Exp $
94	+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.76 2015/06/02 15:53:40 johu Exp $
95	+
96	+ 02 Jun 2015; Johannes Huber <johu@g.o> phonon-4.8.3-r1.ebuild,
97	+ phonon-9999.ebuild:
98	+ Fix gentoo-portage-rsync-mirror merge failure.
99
100	*phonon-4.8.3-r1 (02 Jun 2015)

Gentoo Archives: gentoo-commits