| 1 |
jer 07/11/03 17:55:06 |
| 2 |
|
| 3 |
Modified: ChangeLog opera-9.50_beta2.ebuild |
| 4 |
Log: |
| 5 |
Readd older improvements both generic and specific to fbsd, fix ppc && qt-static. |
| 6 |
(Portage version: 2.1.3.16) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.170 www-client/opera/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?rev=1.170&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?rev=1.170&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?r1=1.169&r2=1.170 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v |
| 18 |
retrieving revision 1.169 |
| 19 |
retrieving revision 1.170 |
| 20 |
diff -u -r1.169 -r1.170 |
| 21 |
--- ChangeLog 3 Nov 2007 17:15:03 -0000 1.169 |
| 22 |
+++ ChangeLog 3 Nov 2007 17:55:05 -0000 1.170 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for www-client/opera |
| 25 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.169 2007/11/03 17:15:03 jer Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.170 2007/11/03 17:55:05 jer Exp $ |
| 28 |
+ |
| 29 |
+ 03 Nov 2007; Jeroen Roovers <jer@g.o> opera-9.50_beta2.ebuild: |
| 30 |
+ Readd older improvements both generic and specific to fbsd, fix ppc && |
| 31 |
+ qt-static. |
| 32 |
|
| 33 |
03 Nov 2007; Jeroen Roovers <jer@g.o> opera-9.50_beta2.ebuild: |
| 34 |
Use the .4 build for FreeBSD. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 www-client/opera/opera-9.50_beta2.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-9.50_beta2.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-9.50_beta2.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-9.50_beta2.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: opera-9.50_beta2.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.50_beta2.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- opera-9.50_beta2.ebuild 3 Nov 2007 17:15:03 -0000 1.2 |
| 51 |
+++ opera-9.50_beta2.ebuild 3 Nov 2007 17:55:05 -0000 1.3 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2007 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.50_beta2.ebuild,v 1.2 2007/11/03 17:15:03 jer Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.50_beta2.ebuild,v 1.3 2007/11/03 17:55:05 jer Exp $ |
| 57 |
|
| 58 |
GCONF_DEBUG="no" |
| 59 |
|
| 60 |
@@ -13,7 +13,7 @@ |
| 61 |
LICENSE="OPERA-9.0" |
| 62 |
KEYWORDS="~ppc ~x86 ~x86-fbsd" |
| 63 |
|
| 64 |
-IUSE="qt-static spell gnome" |
| 65 |
+IUSE="qt-static spell gnome elibc_FreeBSD" |
| 66 |
RESTRICT="strip mirror" |
| 67 |
|
| 68 |
O_LNG="" |
| 69 |
@@ -21,42 +21,46 @@ |
| 70 |
O_VER="9.50-20071102" |
| 71 |
|
| 72 |
O_URI="http://snapshot.opera.com/unix/snapshot-${O_SUFF}/" |
| 73 |
+ |
| 74 |
SRC_URI=" |
| 75 |
ppc? ( ${O_URI}ppc-linux/${PN}-${O_VER}.6-shared-qt.ppc${O_LNG}-${O_SUFF}.tar.bz2 ) |
| 76 |
- x86? ( |
| 77 |
- qt-static? ( ${O_URI}intel-linux/${PN}-${O_VER}.10-static-qt.i386${O_LNG}-${O_SUFF}.tar.bz2 ) |
| 78 |
- !qt-static? ( ${O_URI}intel-linux/${PN}-${O_VER}.6-shared-qt.i386${O_LNG}-${O_SUFF}.tar.bz2 ) ) |
| 79 |
- x86-fbsd? ( |
| 80 |
- qt-static? ( ${O_URI}intel-freebsd/${PN}-${O_VER}.1-static-qt.i386.freebsd${O_LNG}-${O_SUFF}.tar.bz2 ) |
| 81 |
- !qt-static? ( ${O_URI}intel-freebsd/${PN}-${O_VER}.4-shared-qt.i386.freebsd${O_LNG}-${O_SUFF}.tar.bz2 ) ) |
| 82 |
+ x86? ( qt-static? ( ${O_URI}intel-linux/${PN}-${O_VER}.10-static-qt.i386${O_LNG}-${O_SUFF}.tar.bz2 ) |
| 83 |
+ !qt-static? ( ${O_URI}intel-linux/${PN}-${O_VER}.6-shared-qt.i386${O_LNG}-${O_SUFF}.tar.bz2 ) ) |
| 84 |
+ x86-fbsd? ( qt-static? ( ${O_URI}intel-freebsd/${PN}-${O_VER}.1-static-qt.i386.freebsd${O_LNG}-${O_SUFF}.tar.bz2 ) |
| 85 |
+ !qt-static? ( ${O_URI}intel-freebsd/${PN}-${O_VER}.4-shared-qt.i386.freebsd${O_LNG}-${O_SUFF}.tar.bz2 ) ) |
| 86 |
" |
| 87 |
|
| 88 |
DEPEND=">=sys-apps/sed-4" |
| 89 |
|
| 90 |
-RDEPEND=">=media-libs/fontconfig-2.1.94-r1 |
| 91 |
- media-libs/jpeg |
| 92 |
- media-libs/libexif |
| 93 |
- x11-libs/libXrandr |
| 94 |
- x11-libs/libXp |
| 95 |
- x11-libs/libXmu |
| 96 |
- x11-libs/libXi |
| 97 |
- x11-libs/libXft |
| 98 |
- x11-libs/libXext |
| 99 |
- x11-libs/libXcursor |
| 100 |
- x11-libs/libX11 |
| 101 |
- x11-libs/libSM |
| 102 |
- x11-libs/libICE |
| 103 |
- !qt-static? ( =x11-libs/qt-3* ) |
| 104 |
- spell? ( app-text/aspell )" |
| 105 |
+RDEPEND="media-libs/libexif |
| 106 |
+ media-libs/jpeg |
| 107 |
+ >=media-libs/fontconfig-2.1.94-r1 |
| 108 |
+ x11-libs/libXrandr |
| 109 |
+ x11-libs/libXp |
| 110 |
+ x11-libs/libXmu |
| 111 |
+ x11-libs/libXi |
| 112 |
+ x11-libs/libXft |
| 113 |
+ x11-libs/libXext |
| 114 |
+ x11-libs/libXcursor |
| 115 |
+ x11-libs/libX11 |
| 116 |
+ x11-libs/libSM |
| 117 |
+ x11-libs/libICE |
| 118 |
+ !qt-static? ( =x11-libs/qt-3* ) |
| 119 |
+ ppc? ( =x11-libs/qt-3* ) |
| 120 |
+ spell? ( app-text/aspell ) |
| 121 |
+ x86-fbsd? ( =virtual/libstdc++-3* )" |
| 122 |
|
| 123 |
-S=${WORKDIR}/${A/.tar.bz2/} |
| 124 |
+S="${WORKDIR}/${A/.tar.bz2/}" |
| 125 |
|
| 126 |
src_unpack() { |
| 127 |
unpack ${A} |
| 128 |
cd "${S}" |
| 129 |
|
| 130 |
epatch "${FILESDIR}/${PN}-9.00-install.patch" |
| 131 |
- epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch" |
| 132 |
+ |
| 133 |
+ # bug #181300: |
| 134 |
+ use elibc_FreeBSD || epatch "${FILESDIR}/${PN}-9.50-pluginpath.patch" |
| 135 |
+ use elibc_FreeBSD && epatch "${FILESDIR}/${PN}-9.50-pluginpath-fbsd.patch" |
| 136 |
|
| 137 |
sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \ |
| 138 |
-e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \ |
| 139 |
@@ -71,6 +75,7 @@ |
| 140 |
-e "s:/opt/kde:${D}/usr/kde:" \ |
| 141 |
-e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \ |
| 142 |
install.sh || die "sed failed" |
| 143 |
+ |
| 144 |
} |
| 145 |
|
| 146 |
src_compile() { |
| 147 |
@@ -80,7 +85,6 @@ |
| 148 |
} |
| 149 |
|
| 150 |
src_install() { |
| 151 |
- local res |
| 152 |
# Prepare installation directories for Opera's installer script. |
| 153 |
dodir /etc |
| 154 |
|
| 155 |
@@ -100,6 +104,8 @@ |
| 156 |
# Install the icons |
| 157 |
insinto /usr/share/pixmaps |
| 158 |
doins usr/share/pixmaps/opera.xpm |
| 159 |
+ |
| 160 |
+ local res |
| 161 |
for res in 16x16 22x22 32x32 48x48 ; do |
| 162 |
insinto /usr/share/icons/hicolor/${res}/apps |
| 163 |
doins usr/share/icons/hicolor/${res}/apps/opera.png |
| 164 |
@@ -130,7 +136,7 @@ |
| 165 |
echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > "${D}"/etc/revdep-rebuild/90opera |
| 166 |
|
| 167 |
# Change libz.so.3 to libz.so.1 for gentoo/freebsd |
| 168 |
- if use x86-fbsd; then |
| 169 |
+ if use elibc_FreeBSD; then |
| 170 |
scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${PN}/ | \ |
| 171 |
while read i; do |
| 172 |
if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]]; |
| 173 |
@@ -161,7 +167,7 @@ |
| 174 |
elog "To use the spellchecker (USE=spell) for non-English simply do" |
| 175 |
elog "$ emerge app-dicts/aspell-[your language]." |
| 176 |
|
| 177 |
- if use x86-fbsd; then |
| 178 |
+ if use elibc_FreeBSD; then |
| 179 |
elog |
| 180 |
elog "To improve shared memory usage please set:" |
| 181 |
elog "$ sysctl kern.ipc.shm_allow_removed=1" |
| 182 |
|
| 183 |
|
| 184 |
|
| 185 |
-- |
| 186 |
gentoo-commits@g.o mailing list |
Archives