Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/2mandvd: 2mandvd-1.1.1.ebuild 2mandvd-1.2-r1.ebuild ChangeLog
Date: Thu, 29 Apr 2010 08:00:54
Message-Id: 20100429080045.C07ED2C04C@corvid.gentoo.org
1 hwoarang 10/04/29 08:00:45
2
3 Modified: 2mandvd-1.1.1.ebuild 2mandvd-1.2-r1.ebuild
4 ChangeLog
5 Log:
6 Migrate to qt4-r2 eclass wrt bug #311481
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 media-video/2mandvd/2mandvd-1.1.1.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/2mandvd/2mandvd-1.1.1.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/2mandvd/2mandvd-1.1.1.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/2mandvd/2mandvd-1.1.1.ebuild?r1=1.1&r2=1.2
15
16 Index: 2mandvd-1.1.1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.1.1.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- 2mandvd-1.1.1.ebuild 9 Nov 2009 21:06:11 -0000 1.1
23 +++ 2mandvd-1.1.1.ebuild 29 Apr 2010 08:00:45 -0000 1.2
24 @@ -1,10 +1,11 @@
25 -# Copyright 1999-2009 Gentoo Foundation
26 +# Copyright 1999-2010 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.1.1.ebuild,v 1.1 2009/11/09 21:06:11 hwoarang Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.1.1.ebuild,v 1.2 2010/04/29 08:00:45 hwoarang Exp $
30
31 EAPI="2"
32 +LANGS="de en he it pl pt ru"
33
34 -inherit qt4
35 +inherit qt4-r2
36
37 MY_PN="2ManDVD"
38
39 @@ -31,12 +32,6 @@
40
41 S="${WORKDIR}/${MY_PN}"
42
43 -LANGS="de en he it pl pt ru"
44 -
45 -for x in ${LANGS}; do
46 - IUSE="${IUSE} linguas_${x}"
47 -done
48 -
49 src_prepare() {
50 # fix installation path
51 for file in mainfrm.cpp media_browser.cpp rendering.cpp; do
52 @@ -47,11 +42,7 @@
53 sed -i "s:qApp->applicationDirPath():\"/usr/share/${PN}/\":" \
54 mainfrm.cpp || die "sed failed"
55
56 - qt4_src_prepare
57 -}
58 -
59 -src_configure() {
60 - eqmake4 ${MY_PN}.pro
61 + qt4-r2_src_prepare
62 }
63
64 src_install() {
65
66
67
68 1.2 media-video/2mandvd/2mandvd-1.2-r1.ebuild
69
70 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/2mandvd/2mandvd-1.2-r1.ebuild?rev=1.2&view=markup
71 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/2mandvd/2mandvd-1.2-r1.ebuild?rev=1.2&content-type=text/plain
72 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/2mandvd/2mandvd-1.2-r1.ebuild?r1=1.1&r2=1.2
73
74 Index: 2mandvd-1.2-r1.ebuild
75 ===================================================================
76 RCS file: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.2-r1.ebuild,v
77 retrieving revision 1.1
78 retrieving revision 1.2
79 diff -u -r1.1 -r1.2
80 --- 2mandvd-1.2-r1.ebuild 13 Mar 2010 14:43:04 -0000 1.1
81 +++ 2mandvd-1.2-r1.ebuild 29 Apr 2010 08:00:45 -0000 1.2
82 @@ -1,10 +1,11 @@
83 # Copyright 1999-2010 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 -# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.2-r1.ebuild,v 1.1 2010/03/13 14:43:04 hwoarang Exp $
86 +# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/2mandvd-1.2-r1.ebuild,v 1.2 2010/04/29 08:00:45 hwoarang Exp $
87
88 EAPI="2"
89 +LANGS="de en he it pl pt ru"
90
91 -inherit qt4
92 +inherit qt4-r2
93
94 MY_PN="2ManDVD"
95
96 @@ -33,12 +34,6 @@
97
98 S="${WORKDIR}/${MY_PN}"
99
100 -LANGS="de en he it pl pt ru"
101 -
102 -for x in ${LANGS}; do
103 - IUSE="${IUSE} linguas_${x}"
104 -done
105 -
106 src_prepare() {
107 # fix installation path
108 for file in mainfrm.cpp media_browser.cpp rendering.cpp; do
109 @@ -49,11 +44,7 @@
110 sed -i "s:qApp->applicationDirPath():\"/usr/share/${PN}/\":" \
111 mainfrm.cpp || die "sed failed"
112
113 - qt4_src_prepare
114 -}
115 -
116 -src_configure() {
117 - eqmake4 ${MY_PN}.pro
118 + qt4-r2_src_prepare
119 }
120
121 src_install() {
122
123
124
125 1.8 media-video/2mandvd/ChangeLog
126
127 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/2mandvd/ChangeLog?rev=1.8&view=markup
128 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/2mandvd/ChangeLog?rev=1.8&content-type=text/plain
129 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/2mandvd/ChangeLog?r1=1.7&r2=1.8
130
131 Index: ChangeLog
132 ===================================================================
133 RCS file: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v
134 retrieving revision 1.7
135 retrieving revision 1.8
136 diff -u -r1.7 -r1.8
137 --- ChangeLog 25 Mar 2010 20:37:38 -0000 1.7
138 +++ ChangeLog 29 Apr 2010 08:00:45 -0000 1.8
139 @@ -1,6 +1,10 @@
140 # ChangeLog for media-video/2mandvd
141 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
142 -# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.7 2010/03/25 20:37:38 hwoarang Exp $
143 +# $Header: /var/cvsroot/gentoo-x86/media-video/2mandvd/ChangeLog,v 1.8 2010/04/29 08:00:45 hwoarang Exp $
144 +
145 + 29 Apr 2010; Markos Chandras <hwoarang@g.o> 2mandvd-1.1.1.ebuild,
146 + 2mandvd-1.2-r1.ebuild:
147 + Migrate to qt4-r2 eclass wrt bug #311481
148
149 *2mandvd-1.3.3 (25 Mar 2010)