| 1 |
tommy 09/08/02 21:54:28 |
| 2 |
|
| 3 |
Modified: qt-3.3.8b-r2.ebuild ChangeLog qt-3.3.8b-r1.ebuild |
| 4 |
Log: |
| 5 |
Enable multilib support for qt-3.3.8b-r{1,2} |
| 6 |
(Portage version: 2.2_rc33-r5/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 x11-libs/qt/qt-3.3.8b-r2.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8b-r2.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8b-r2.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8b-r2.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: qt-3.3.8b-r2.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r2.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- qt-3.3.8b-r2.ebuild 11 Jun 2009 20:46:10 -0000 1.1 |
| 22 |
+++ qt-3.3.8b-r2.ebuild 2 Aug 2009 21:54:28 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r2.ebuild,v 1.1 2009/06/11 20:46:10 yngwin Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r2.ebuild,v 1.2 2009/08/02 21:54:28 tommy Exp $ |
| 28 |
|
| 29 |
# *** Please remember to update qt3.eclass when revbumping this *** |
| 30 |
|
| 31 |
@@ -51,8 +51,6 @@ |
| 32 |
|
| 33 |
QTBASE="/usr/qt/3" |
| 34 |
|
| 35 |
-libdir="$(get_libdir)" |
| 36 |
- |
| 37 |
pkg_setup() { |
| 38 |
if use immqt && use immqt-bc ; then |
| 39 |
ewarn |
| 40 |
@@ -167,8 +165,8 @@ |
| 41 |
-e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ |
| 42 |
"${S}"/mkspecs/${PLATFORM}/qmake.conf || die |
| 43 |
|
| 44 |
- if [ ${libdir} != "lib" ] ; then |
| 45 |
- sed -i -e "s:/lib$:/${libdir}:" \ |
| 46 |
+ if [ $(get_libdir) != "lib" ] ; then |
| 47 |
+ sed -i -e "s:/lib$:/$(get_libdir):" \ |
| 48 |
"${S}"/mkspecs/${PLATFORM}/qmake.conf || die |
| 49 |
fi |
| 50 |
|
| 51 |
@@ -185,12 +183,12 @@ |
| 52 |
addwrite "${QTBASE}/etc/settings" |
| 53 |
addwrite "${HOME}/.qt" |
| 54 |
|
| 55 |
- [ "${libdir}" != "lib" ] && myconf="${myconf} -L/usr/${libdir}" |
| 56 |
+ [ "$(get_libdir)" != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)" |
| 57 |
|
| 58 |
# unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178. |
| 59 |
use nas && myconf+=" -system-nas-sound" |
| 60 |
use nis && myconf+=" -nis" || myconf+=" -no-nis" |
| 61 |
- use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/${libdir}/mysql" || myconf+=" -no-sql-mysql" |
| 62 |
+ use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" |
| 63 |
use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" |
| 64 |
use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" |
| 65 |
use sqlite && myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite" |
| 66 |
@@ -212,7 +210,7 @@ |
| 67 |
./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ |
| 68 |
-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ |
| 69 |
-system-libpng -xft -platform ${PLATFORM} -xplatform \ |
| 70 |
- ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/${libdir} \ |
| 71 |
+ ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \ |
| 72 |
-fast -no-sql-odbc ${myconf} -dlopen-opengl || die |
| 73 |
|
| 74 |
emake src-qmake src-moc sub-src || die |
| 75 |
@@ -249,7 +247,7 @@ |
| 76 |
dolib.so lib/lib{editor,qassistantclient,designercore}.a |
| 77 |
dolib.so lib/libqt-mt.la |
| 78 |
dolib.so lib/libqt-mt.so.${PV/b} lib/libqui.so.1.0.0 |
| 79 |
- cd "${D}"/${QTBASE}/${libdir} |
| 80 |
+ cd "${D}"/${QTBASE}/$(get_libdir) |
| 81 |
|
| 82 |
for x in libqui.so ; do |
| 83 |
ln -s $x.1.0.0 $x.1.0 |
| 84 |
@@ -287,7 +285,7 @@ |
| 85 |
|
| 86 |
# prl files |
| 87 |
sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl |
| 88 |
- insinto ${QTBASE}/${libdir} |
| 89 |
+ insinto ${QTBASE}/$(get_libdir) |
| 90 |
doins "${S}"/lib/*.prl |
| 91 |
|
| 92 |
# pkg-config file |
| 93 |
|
| 94 |
|
| 95 |
|
| 96 |
1.586 x11-libs/qt/ChangeLog |
| 97 |
|
| 98 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?rev=1.586&view=markup |
| 99 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?rev=1.586&content-type=text/plain |
| 100 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/ChangeLog?r1=1.585&r2=1.586 |
| 101 |
|
| 102 |
Index: ChangeLog |
| 103 |
=================================================================== |
| 104 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v |
| 105 |
retrieving revision 1.585 |
| 106 |
retrieving revision 1.586 |
| 107 |
diff -u -r1.585 -r1.586 |
| 108 |
--- ChangeLog 27 Jun 2009 19:30:37 -0000 1.585 |
| 109 |
+++ ChangeLog 2 Aug 2009 21:54:28 -0000 1.586 |
| 110 |
@@ -1,6 +1,10 @@ |
| 111 |
# ChangeLog for x11-libs/qt |
| 112 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 113 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.585 2009/06/27 19:30:37 yngwin Exp $ |
| 114 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.586 2009/08/02 21:54:28 tommy Exp $ |
| 115 |
+ |
| 116 |
+ 02 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@g.o> |
| 117 |
+ qt-3.3.8b-r1.ebuild, qt-3.3.8b-r2.ebuild: |
| 118 |
+ Enable multilib support for qt-3.3.8b-r{1,2} |
| 119 |
|
| 120 |
*qt-4.5.2 (27 Jun 2009) |
| 121 |
|
| 122 |
|
| 123 |
|
| 124 |
|
| 125 |
1.8 x11-libs/qt/qt-3.3.8b-r1.ebuild |
| 126 |
|
| 127 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8b-r1.ebuild?rev=1.8&view=markup |
| 128 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8b-r1.ebuild?rev=1.8&content-type=text/plain |
| 129 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt/qt-3.3.8b-r1.ebuild?r1=1.7&r2=1.8 |
| 130 |
|
| 131 |
Index: qt-3.3.8b-r1.ebuild |
| 132 |
=================================================================== |
| 133 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r1.ebuild,v |
| 134 |
retrieving revision 1.7 |
| 135 |
retrieving revision 1.8 |
| 136 |
diff -u -r1.7 -r1.8 |
| 137 |
--- qt-3.3.8b-r1.ebuild 17 Jan 2009 16:41:01 -0000 1.7 |
| 138 |
+++ qt-3.3.8b-r1.ebuild 2 Aug 2009 21:54:28 -0000 1.8 |
| 139 |
@@ -1,6 +1,6 @@ |
| 140 |
# Copyright 1999-2009 Gentoo Foundation |
| 141 |
# Distributed under the terms of the GNU General Public License v2 |
| 142 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r1.ebuild,v 1.7 2009/01/17 16:41:01 nixnut Exp $ |
| 143 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8b-r1.ebuild,v 1.8 2009/08/02 21:54:28 tommy Exp $ |
| 144 |
|
| 145 |
# *** Please remember to update qt3.eclass when revbumping this *** |
| 146 |
|
| 147 |
@@ -51,8 +51,6 @@ |
| 148 |
|
| 149 |
QTBASE="/usr/qt/3" |
| 150 |
|
| 151 |
-libdir="$(get_libdir)" |
| 152 |
- |
| 153 |
pkg_setup() { |
| 154 |
if use immqt && use immqt-bc ; then |
| 155 |
ewarn |
| 156 |
@@ -167,8 +165,8 @@ |
| 157 |
-e "s:\<QMAKE_LINK_SHLIB\>.*=.*:QMAKE_LINK_SHLIB=$(tc-getCXX):" \ |
| 158 |
"${S}"/mkspecs/${PLATFORM}/qmake.conf || die |
| 159 |
|
| 160 |
- if [ ${libdir} != "lib" ] ; then |
| 161 |
- sed -i -e "s:/lib$:/${libdir}:" \ |
| 162 |
+ if [ $(get_libdir) != "lib" ] ; then |
| 163 |
+ sed -i -e "s:/lib$:/$(get_libdir):" \ |
| 164 |
"${S}"/mkspecs/${PLATFORM}/qmake.conf || die |
| 165 |
fi |
| 166 |
|
| 167 |
@@ -185,12 +183,12 @@ |
| 168 |
addwrite "${QTBASE}/etc/settings" |
| 169 |
addwrite "${HOME}/.qt" |
| 170 |
|
| 171 |
- [ "${libdir}" != "lib" ] && myconf="${myconf} -L/usr/${libdir}" |
| 172 |
+ [ "$(get_libdir)" != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)" |
| 173 |
|
| 174 |
# unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178. |
| 175 |
use nas && myconf+=" -system-nas-sound" |
| 176 |
use nis && myconf+=" -nis" || myconf+=" -no-nis" |
| 177 |
- use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/${libdir}/mysql" || myconf+=" -no-sql-mysql" |
| 178 |
+ use mysql && myconf+=" -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf+=" -no-sql-mysql" |
| 179 |
use postgres && myconf+=" -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf+=" -no-sql-psql" |
| 180 |
use firebird && myconf+=" -plugin-sql-ibase -I/opt/firebird/include" || myconf+=" -no-sql-ibase" |
| 181 |
use sqlite && myconf+=" -plugin-sql-sqlite" || myconf+=" -no-sql-sqlite" |
| 182 |
@@ -212,7 +210,7 @@ |
| 183 |
./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ |
| 184 |
-qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ |
| 185 |
-system-libpng -xft -platform ${PLATFORM} -xplatform \ |
| 186 |
- ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/${libdir} \ |
| 187 |
+ ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \ |
| 188 |
-fast -no-sql-odbc ${myconf} -dlopen-opengl || die |
| 189 |
|
| 190 |
emake src-qmake src-moc sub-src || die |
| 191 |
@@ -249,7 +247,7 @@ |
| 192 |
dolib.so lib/lib{editor,qassistantclient,designercore}.a |
| 193 |
dolib.so lib/libqt-mt.la |
| 194 |
dolib.so lib/libqt-mt.so.${PV/b} lib/libqui.so.1.0.0 |
| 195 |
- cd "${D}"/${QTBASE}/${libdir} |
| 196 |
+ cd "${D}"/${QTBASE}/$(get_libdir) |
| 197 |
|
| 198 |
for x in libqui.so ; do |
| 199 |
ln -s $x.1.0.0 $x.1.0 |
| 200 |
@@ -287,11 +285,11 @@ |
| 201 |
|
| 202 |
# prl files |
| 203 |
sed -i -e "s:${S}:${QTBASE}:g" "${S}"/lib/*.prl |
| 204 |
- insinto ${QTBASE}/${libdir} |
| 205 |
+ insinto ${QTBASE}/$(get_libdir) |
| 206 |
doins "${S}"/lib/*.prl |
| 207 |
|
| 208 |
# pkg-config file |
| 209 |
- insinto ${QTBASE}/${libdir}/pkgconfig |
| 210 |
+ insinto ${QTBASE}/$(get_libdir)/pkgconfig |
| 211 |
doins "${S}"/lib/*.pc |
| 212 |
|
| 213 |
# List all the multilib libdirs |
| 214 |
@@ -307,7 +305,7 @@ |
| 215 |
LDPATH=${libdirs:1} |
| 216 |
QMAKESPEC=${PLATFORM} |
| 217 |
MANPATH=${QTBASE}/doc/man |
| 218 |
-PKG_CONFIG_PATH=${QTBASE}/${libdir}/pkgconfig |
| 219 |
+PKG_CONFIG_PATH=${QTBASE}/$(get_libdir)/pkgconfig |
| 220 |
EOF |
| 221 |
|
| 222 |
cat <<EOF > "${T}"/50qtdir3 |
Archives