1 |
radhermit 11/02/04 19:51:04 |
2 |
|
3 |
Modified: ChangeLog libbluray-9999.ebuild |
4 |
Log: |
5 |
Add dependency on dev-java/ant-core for bug #353635. Bump to EAPI 4 and use diff friendly dependency lines. |
6 |
|
7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.4 media-libs/libbluray/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/ChangeLog?rev=1.4&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/ChangeLog?rev=1.4&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/ChangeLog?r1=1.3&r2=1.4 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v |
19 |
retrieving revision 1.3 |
20 |
retrieving revision 1.4 |
21 |
diff -u -r1.3 -r1.4 |
22 |
--- ChangeLog 1 Feb 2011 12:52:58 -0000 1.3 |
23 |
+++ ChangeLog 4 Feb 2011 19:51:04 -0000 1.4 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-libs/libbluray |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.3 2011/02/01 12:52:58 radhermit Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.4 2011/02/04 19:51:04 radhermit Exp $ |
29 |
+ |
30 |
+ 04 Feb 2011; Tim Harder <radhermit@g.o> libbluray-9999.ebuild: |
31 |
+ Add dependency on dev-java/ant-core for bug #353635. Bump to EAPI 4 and use |
32 |
+ diff friendly dependency lines. |
33 |
|
34 |
01 Feb 2011; Tim Harder <radhermit@g.o> +files/90libbluray, |
35 |
libbluray-9999.ebuild: |
36 |
|
37 |
|
38 |
|
39 |
1.4 media-libs/libbluray/libbluray-9999.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild?rev=1.4&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild?rev=1.4&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild?r1=1.3&r2=1.4 |
44 |
|
45 |
Index: libbluray-9999.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild,v |
48 |
retrieving revision 1.3 |
49 |
retrieving revision 1.4 |
50 |
diff -u -r1.3 -r1.4 |
51 |
--- libbluray-9999.ebuild 1 Feb 2011 12:52:58 -0000 1.3 |
52 |
+++ libbluray-9999.ebuild 4 Feb 2011 19:51:04 -0000 1.4 |
53 |
@@ -1,8 +1,8 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild,v 1.3 2011/02/01 12:52:58 radhermit Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild,v 1.4 2011/02/04 19:51:04 radhermit Exp $ |
58 |
|
59 |
-EAPI=2 |
60 |
+EAPI=4 |
61 |
|
62 |
inherit autotools java-pkg-opt-2 git flag-o-matic |
63 |
|
64 |
@@ -16,14 +16,25 @@ |
65 |
KEYWORDS="" |
66 |
IUSE="aacs java static-libs utils xine" |
67 |
|
68 |
-COMMON_DEPEND="dev-libs/libxml2 |
69 |
- xine? ( media-libs/xine-lib )" |
70 |
-RDEPEND="${COMMON_DEPEND} |
71 |
+COMMON_DEPEND=" |
72 |
+ dev-libs/libxml2 |
73 |
+ xine? ( media-libs/xine-lib ) |
74 |
+" |
75 |
+RDEPEND=" |
76 |
+ ${COMMON_DEPEND} |
77 |
aacs? ( media-video/aacskeys ) |
78 |
- java? ( >=virtual/jre-1.6 )" |
79 |
-DEPEND="${COMMON_DEPEND} |
80 |
- java? ( >=virtual/jdk-1.6 ) |
81 |
- dev-util/pkgconfig" |
82 |
+ java? ( >=virtual/jre-1.6 ) |
83 |
+" |
84 |
+DEPEND=" |
85 |
+ ${COMMON_DEPEND} |
86 |
+ java? ( |
87 |
+ >=virtual/jdk-1.6 |
88 |
+ dev-java/ant-core |
89 |
+ ) |
90 |
+ dev-util/pkgconfig |
91 |
+" |
92 |
+ |
93 |
+DOCS="doc/README README.txt TODO.txt" |
94 |
|
95 |
src_prepare() { |
96 |
use java && export JDK_HOME="$(java-config -g JAVA_HOME)" |
97 |
@@ -49,26 +60,24 @@ |
98 |
} |
99 |
|
100 |
src_compile() { |
101 |
- emake || die |
102 |
+ emake |
103 |
|
104 |
if use xine; then |
105 |
- cd player_wrappers/xine || die |
106 |
- emake || die |
107 |
+ cd player_wrappers/xine |
108 |
+ emake |
109 |
fi |
110 |
} |
111 |
|
112 |
src_install() { |
113 |
- emake DESTDIR="${D}" install || die |
114 |
- |
115 |
- dodoc doc/README README.txt TODO.txt || die |
116 |
+ default_src_install |
117 |
|
118 |
if use utils; then |
119 |
cd src/examples/ |
120 |
- dobin clpi_dump index_dump mobj_dump mpls_dump sound_dump || die |
121 |
+ dobin clpi_dump index_dump mobj_dump mpls_dump sound_dump |
122 |
cd .libs/ |
123 |
- dobin bd_info bdsplice hdmv_test libbluray_test list_titles || die |
124 |
+ dobin bd_info bdsplice hdmv_test libbluray_test list_titles |
125 |
if use java; then |
126 |
- dobin bdj_test || die |
127 |
+ dobin bdj_test |
128 |
fi |
129 |
fi |
130 |
|
131 |
@@ -78,8 +87,8 @@ |
132 |
fi |
133 |
|
134 |
if use xine; then |
135 |
- cd "${S}"/player_wrappers/xine || die |
136 |
- emake DESTDIR="${D}" install || die |
137 |
+ cd "${S}"/player_wrappers/xine |
138 |
+ emake DESTDIR="${D}" install |
139 |
newdoc HOWTO README.xine |
140 |
fi |
141 |
} |