1 |
vapier 13/09/28 09:37:31 |
2 |
|
3 |
Modified: metadata.xml imlib2-1.4.5.ebuild ChangeLog |
4 |
Added: imlib2-9999.ebuild |
5 |
Removed: imlib2-1.4.4.ebuild |
6 |
Log: |
7 |
Clean up ebuild and merge live git version from E overlay. |
8 |
|
9 |
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
10 |
|
11 |
Revision Changes Path |
12 |
1.4 media-libs/imlib2/metadata.xml |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/metadata.xml?rev=1.4&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/metadata.xml?rev=1.4&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/metadata.xml?r1=1.3&r2=1.4 |
17 |
|
18 |
Index: metadata.xml |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/imlib2/metadata.xml,v |
21 |
retrieving revision 1.3 |
22 |
retrieving revision 1.4 |
23 |
diff -u -r1.3 -r1.4 |
24 |
--- metadata.xml 24 Sep 2011 09:39:13 -0000 1.3 |
25 |
+++ metadata.xml 28 Sep 2013 09:37:31 -0000 1.4 |
26 |
@@ -1,9 +1,7 @@ |
27 |
<?xml version="1.0" encoding="UTF-8"?> |
28 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
29 |
<pkgmetadata> |
30 |
-<maintainer> |
31 |
- <email>vapier@g.o</email> |
32 |
-</maintainer> |
33 |
+<herd>enlightenment</herd> |
34 |
<longdescription> |
35 |
Imlib 2 is the successor to Imlib. It is not just a newer version - it is a |
36 |
completely new library. Imlib2 can be installed alongside Imlib 1.x without any |
37 |
|
38 |
|
39 |
|
40 |
1.11 media-libs/imlib2/imlib2-1.4.5.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.5.ebuild?rev=1.11&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.5.ebuild?rev=1.11&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-1.4.5.ebuild?r1=1.10&r2=1.11 |
45 |
|
46 |
Index: imlib2-1.4.5.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5.ebuild,v |
49 |
retrieving revision 1.10 |
50 |
retrieving revision 1.11 |
51 |
diff -u -r1.10 -r1.11 |
52 |
--- imlib2-1.4.5.ebuild 13 Aug 2013 07:56:56 -0000 1.10 |
53 |
+++ imlib2-1.4.5.ebuild 28 Sep 2013 09:37:31 -0000 1.11 |
54 |
@@ -1,15 +1,22 @@ |
55 |
# Copyright 1999-2013 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5.ebuild,v 1.10 2013/08/13 07:56:56 ssuominen Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5.ebuild,v 1.11 2013/09/28 09:37:31 vapier Exp $ |
59 |
+ |
60 |
+EAPI="4" |
61 |
+ |
62 |
+EGIT_SUB_PROJECT="legacy" |
63 |
+EGIT_URI_APPEND=${PN} |
64 |
+ |
65 |
+if [[ ${PV} != "9999" ]] ; then |
66 |
+ EKEY_STATE="release" |
67 |
+fi |
68 |
|
69 |
-EAPI=4 |
70 |
inherit enlightenment toolchain-funcs |
71 |
|
72 |
DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" |
73 |
HOMEPAGE="http://www.enlightenment.org/" |
74 |
|
75 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd" |
76 |
-IUSE="X bzip2 gif jpeg mmx mp3 png static-libs tiff zlib" |
77 |
+IUSE="bzip2 gif jpeg mmx mp3 png static-libs tiff X zlib" |
78 |
|
79 |
RDEPEND="=media-libs/freetype-2* |
80 |
bzip2? ( app-arch/bzip2 ) |
81 |
@@ -21,27 +28,26 @@ |
82 |
X? ( |
83 |
x11-libs/libX11 |
84 |
x11-libs/libXext |
85 |
- ) |
86 |
+ ) |
87 |
mp3? ( media-libs/libid3tag )" |
88 |
DEPEND="${RDEPEND} |
89 |
png? ( virtual/pkgconfig ) |
90 |
X? ( |
91 |
x11-proto/xextproto |
92 |
x11-proto/xproto |
93 |
- )" |
94 |
+ )" |
95 |
|
96 |
src_configure() { |
97 |
# imlib2 has diff configure options for x86/amd64 mmx |
98 |
- local myconf |
99 |
if [[ $(tc-arch) == amd64 ]]; then |
100 |
- myconf="$(use_enable mmx amd64) --disable-mmx" |
101 |
+ E_ECONF+=( $(use_enable mmx amd64) --disable-mmx ) |
102 |
else |
103 |
- myconf="--disable-amd64 $(use_enable mmx)" |
104 |
+ E_ECONF+=( --disable-amd64 $(use_enable mmx) ) |
105 |
fi |
106 |
|
107 |
- [[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding" |
108 |
+ [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding ) |
109 |
|
110 |
- export MY_ECONF=" |
111 |
+ E_ECONF+=( |
112 |
$(use_enable static-libs static) |
113 |
$(use_with X x) |
114 |
$(use_with jpeg) |
115 |
@@ -51,8 +57,7 @@ |
116 |
$(use_with zlib) |
117 |
$(use_with bzip2) |
118 |
$(use_with mp3 id3) |
119 |
- ${myconf} |
120 |
- " |
121 |
+ ) |
122 |
|
123 |
enlightenment_src_configure |
124 |
} |
125 |
@@ -61,5 +66,5 @@ |
126 |
enlightenment_src_install |
127 |
|
128 |
# enlightenment_src_install should take care of this for us, but it doesn't |
129 |
- find "${ED}" -name '*.la' -exec rm -f {} + |
130 |
+ find "${ED}" -name '*.la' -delete |
131 |
} |
132 |
|
133 |
|
134 |
|
135 |
1.117 media-libs/imlib2/ChangeLog |
136 |
|
137 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/ChangeLog?rev=1.117&view=markup |
138 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/ChangeLog?rev=1.117&content-type=text/plain |
139 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/ChangeLog?r1=1.116&r2=1.117 |
140 |
|
141 |
Index: ChangeLog |
142 |
=================================================================== |
143 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v |
144 |
retrieving revision 1.116 |
145 |
retrieving revision 1.117 |
146 |
diff -u -r1.116 -r1.117 |
147 |
--- ChangeLog 13 Aug 2013 07:56:56 -0000 1.116 |
148 |
+++ ChangeLog 28 Sep 2013 09:37:31 -0000 1.117 |
149 |
@@ -1,6 +1,13 @@ |
150 |
# ChangeLog for media-libs/imlib2 |
151 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
152 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.116 2013/08/13 07:56:56 ssuominen Exp $ |
153 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.117 2013/09/28 09:37:31 vapier Exp $ |
154 |
+ |
155 |
+*imlib2-9999 (28 Sep 2013) |
156 |
+ |
157 |
+ 28 Sep 2013; Mike Frysinger <vapier@g.o> +imlib2-9999.ebuild, |
158 |
+ -files/imlib2-1.4.4-libpng-1.5.patch, -imlib2-1.4.4.ebuild, |
159 |
+ imlib2-1.4.5.ebuild, metadata.xml: |
160 |
+ Clean up ebuild and merge live git version from E overlay. |
161 |
|
162 |
13 Aug 2013; Samuli Suominen <ssuominen@g.o> imlib2-1.4.4.ebuild, |
163 |
imlib2-1.4.5.ebuild: |
164 |
|
165 |
|
166 |
|
167 |
1.18 media-libs/imlib2/imlib2-9999.ebuild |
168 |
|
169 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild?rev=1.18&view=markup |
170 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild?rev=1.18&content-type=text/plain |
171 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild?r1=1.17&r2=1.18 |