From: Simon Stelling Date: Sun, 4 Feb 2007 12:49:31 +0000 (+0000) Subject: put /usr/qt/3/lib32 into LDPATH; bug 162805 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=15a3048a4c76d4c044a46e02b7119a9f273782db;p=gentoo.git put /usr/qt/3/lib32 into LDPATH; bug 162805 Package-Manager: portage-2.1.2-r7 --- diff --git a/app-emulation/emul-linux-x86-qtlibs/ChangeLog b/app-emulation/emul-linux-x86-qtlibs/ChangeLog index a0d3ef32b834..fd1e665c859d 100644 --- a/app-emulation/emul-linux-x86-qtlibs/ChangeLog +++ b/app-emulation/emul-linux-x86-qtlibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-qtlibs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.23 2007/01/05 10:25:45 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.24 2007/02/04 12:49:31 blubb Exp $ + +*emul-linux-x86-qtlibs-3.4.4-r5 (04 Feb 2007) + + 04 Feb 2007; Simon Stelling +files/46emul-qt3, + +emul-linux-x86-qtlibs-3.4.4-r5.ebuild: + put /usr/qt/3/lib32 into LDPATH; bug 162805 *emul-linux-x86-qtlibs-3.4.4-r4 (05 Jan 2007) diff --git a/app-emulation/emul-linux-x86-qtlibs/Manifest b/app-emulation/emul-linux-x86-qtlibs/Manifest index a2b7c7d03fdb..6bf47bb1754f 100644 --- a/app-emulation/emul-linux-x86-qtlibs/Manifest +++ b/app-emulation/emul-linux-x86-qtlibs/Manifest @@ -1,10 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 45emul-linux-x86-qtlibs 65 RMD160 e169ca0b5cde06f40f215121db1e0972a6c270db SHA1 30febf2c0e34a8d0cddc5aa42a358cd13efcffd8 SHA256 f60c331710f75740ebe75e63bd1a7badbe2ad920a1dcb6a3e0ec68fc15715ce3 MD5 a4059b33b988cf4fc0f5b9616370128c files/45emul-linux-x86-qtlibs 65 RMD160 e169ca0b5cde06f40f215121db1e0972a6c270db files/45emul-linux-x86-qtlibs 65 SHA256 f60c331710f75740ebe75e63bd1a7badbe2ad920a1dcb6a3e0ec68fc15715ce3 files/45emul-linux-x86-qtlibs 65 +AUX 46emul-qt3 23 RMD160 c9b991c09a015f8e580d9924a46a2a9ebad64c3d SHA1 9431a1a2164bbf5b6f8ecf11a44dd1635abcd6aa SHA256 4a957c1d4c564e6f3ad6f4ea69ee5cf60025f80658ff539867176c64d4add577 +MD5 3a049ce27f6bae8f704aa71f267779f6 files/46emul-qt3 23 +RMD160 c9b991c09a015f8e580d9924a46a2a9ebad64c3d files/46emul-qt3 23 +SHA256 4a957c1d4c564e6f3ad6f4ea69ee5cf60025f80658ff539867176c64d4add577 files/46emul-qt3 23 DIST emul-linux-x86-qtlibs-2.2.tar.bz2 7161611 RMD160 7a1593abb50acfddfc3371bcad5a3ef4e4ff7b07 SHA1 ef9070e6123203c6ec196c358f3281d99b447a6a SHA256 862362c604819160782f3a7938c4cc440da6ef6ea3c5719f260109a8f63705de DIST emul-linux-x86-qtlibs-3.4.4-r3-emul.patch.bz2 150442 RMD160 1484b94ea1ff403acd9ccb86392f2efa28333441 SHA1 bea7cc09ed0b85a4457691e354e23c19b5820ce0 SHA256 f809afcba27f2b8726847142864b85b9d0a3b0fffed360516906f85c19e73129 DIST emul-linux-x86-qtlibs-extras-3.4.4.tar.bz2 1220350 RMD160 2cd67c380890710af1d73c519071b88b6a57255e SHA1 97b00922575194f7ce4bbf252faff7855f02d268 SHA256 5f7251066ed911f196566237cef58f57daa168325f275fc31d2a71dbe5b45250 @@ -22,14 +23,18 @@ EBUILD emul-linux-x86-qtlibs-3.4.4-r4.ebuild 1279 RMD160 02c676158f546c83d1e1bd7 MD5 6c22fea96b1036ca402274d4ee943b76 emul-linux-x86-qtlibs-3.4.4-r4.ebuild 1279 RMD160 02c676158f546c83d1e1bd7b8efeccfcbe721d1e emul-linux-x86-qtlibs-3.4.4-r4.ebuild 1279 SHA256 66d73af625f5f7d73515d5f7fbceb51a5031ad11f48777880fe6691778405b4c emul-linux-x86-qtlibs-3.4.4-r4.ebuild 1279 +EBUILD emul-linux-x86-qtlibs-3.4.4-r5.ebuild 1318 RMD160 aba263bc962912454f11005ae7aa46c30d375ee2 SHA1 91c5c2695bfa3f373cb16b52a3a9b28069532ccd SHA256 f80a2e586b393382aed9c0e6bc639714b68c7e237f022d79aa35ec786b2e1b48 +MD5 6cd398419d2d87063c04cf840892bbab emul-linux-x86-qtlibs-3.4.4-r5.ebuild 1318 +RMD160 aba263bc962912454f11005ae7aa46c30d375ee2 emul-linux-x86-qtlibs-3.4.4-r5.ebuild 1318 +SHA256 f80a2e586b393382aed9c0e6bc639714b68c7e237f022d79aa35ec786b2e1b48 emul-linux-x86-qtlibs-3.4.4-r5.ebuild 1318 EBUILD emul-linux-x86-qtlibs-3.4.4.ebuild 854 RMD160 21735d8f971ce23b2031a694dbd0d191fb8e9a04 SHA1 e26e14ff2d8692f8fb7b64de158d440b599e952f SHA256 da743b3029257d0fbf741b97f4f69d1eeda3d794dca0b3e80f3237a55df18512 MD5 7db6f7722697e455bc41c0b22694d67b emul-linux-x86-qtlibs-3.4.4.ebuild 854 RMD160 21735d8f971ce23b2031a694dbd0d191fb8e9a04 emul-linux-x86-qtlibs-3.4.4.ebuild 854 SHA256 da743b3029257d0fbf741b97f4f69d1eeda3d794dca0b3e80f3237a55df18512 emul-linux-x86-qtlibs-3.4.4.ebuild 854 -MISC ChangeLog 4193 RMD160 1d03f72b353207d1a4bdab981e29f1542a329c2a SHA1 389037663e153c8f6202352925284155d8675bb5 SHA256 60c613ce7e7698309408fdd33aed07481a34285ec5b1cf75b41385688bcf00de -MD5 db71fe6d8561e69d67f37584c9413419 ChangeLog 4193 -RMD160 1d03f72b353207d1a4bdab981e29f1542a329c2a ChangeLog 4193 -SHA256 60c613ce7e7698309408fdd33aed07481a34285ec5b1cf75b41385688bcf00de ChangeLog 4193 +MISC ChangeLog 4396 RMD160 68a53477b14963909fbcd49f73e63ed40ccca17b SHA1 843771a251cdc44ceb10ee697f59b258a831f4ed SHA256 fd31d121fe9213c9a05176ca2fef56cf5416aabcd16cafcdd94a21966e8fbec1 +MD5 7661ba16c790eaf26a5453a3b8d0daa8 ChangeLog 4396 +RMD160 68a53477b14963909fbcd49f73e63ed40ccca17b ChangeLog 4396 +SHA256 fd31d121fe9213c9a05176ca2fef56cf5416aabcd16cafcdd94a21966e8fbec1 ChangeLog 4396 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290 @@ -46,10 +51,6 @@ SHA256 209ef686a915ef493fd326e68c9838bc00aae691648dedf035ce089d8157052b files/di MD5 ee64243cabbc93b7a7c5a4dfba3b28da files/digest-emul-linux-x86-qtlibs-3.4.4-r4 1240 RMD160 4eccf3e565a701e9de2cd56eaf263ea241a82678 files/digest-emul-linux-x86-qtlibs-3.4.4-r4 1240 SHA256 af6fe4df9e163398df9f37474ae3bafae0629fd6fc37bf076435af314560c80e files/digest-emul-linux-x86-qtlibs-3.4.4-r4 1240 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFniex8bi6rjpTunYRAqk2AJ47o3SSFpnJMWWIEeErljuPV1fDjACgneZG -bS1l87lntbRpvcd+AM0P/Oo= -=xRLN ------END PGP SIGNATURE----- +MD5 ee64243cabbc93b7a7c5a4dfba3b28da files/digest-emul-linux-x86-qtlibs-3.4.4-r5 1240 +RMD160 4eccf3e565a701e9de2cd56eaf263ea241a82678 files/digest-emul-linux-x86-qtlibs-3.4.4-r5 1240 +SHA256 af6fe4df9e163398df9f37474ae3bafae0629fd6fc37bf076435af314560c80e files/digest-emul-linux-x86-qtlibs-3.4.4-r5 1240 diff --git a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-3.4.4-r5.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-3.4.4-r5.ebuild new file mode 100644 index 000000000000..c9260fd62716 --- /dev/null +++ b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-3.4.4-r5.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-3.4.4-r5.ebuild,v 1.1 2007/02/04 12:49:31 blubb Exp $ + +inherit eutils + +DESCRIPTION="QT 2/3 libraries for emulation of 32bit x86 on amd64" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="immqt-bc? ( mirror://gentoo/emul-linux-x86-qtlibs-immqt-${PV}.tar.bz2 ) + !immqt-bc? ( mirror://gentoo/emul-linux-x86-qtlibs-noime-${PV}.tar.bz2 ) + mirror://gentoo/emul-linux-x86-qtlibs-extras-${PV}.tar.bz2 + mirror://gentoo/${P}-r3-emul.patch.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="immqt-bc" +RESTRICT="nostrip" + +RDEPEND="virtual/libc + >=app-emulation/emul-linux-x86-baselibs-2.5.5-r2 + >=app-emulation/emul-linux-x86-xlibs-7.0-r7" + +S=${WORKDIR} + +src_unpack() { + unpack ${A} + cd "${S}" + mkdir -p usr/qt/3 + mv emul/linux/x86/usr/lib usr/lib32 || die + mv emul/linux/x86/usr/qt/3/lib usr/qt/3/lib32 || die + mv emul/linux/x86/usr/qt/3/plugins usr/qt/3/ || die + rmdir emul/linux/x86/usr/qt/3 emul/linux/x86/usr/qt emul/linux/x86/usr emul/linux/x86 emul/linux emul || die + epatch ${P}-r3-emul.patch + rm ${P}-r3-emul.patch || die +} + +src_install() { + cp -a "${WORKDIR}"/* "${D}"/ || die + doenvd "${FILESDIR}"/46emul-qt3 || die +} diff --git a/app-emulation/emul-linux-x86-qtlibs/files/46emul-qt3 b/app-emulation/emul-linux-x86-qtlibs/files/46emul-qt3 new file mode 100644 index 000000000000..9e16c2f32174 --- /dev/null +++ b/app-emulation/emul-linux-x86-qtlibs/files/46emul-qt3 @@ -0,0 +1 @@ +LDPATH=/usr/qt/3/lib32 diff --git a/app-emulation/emul-linux-x86-qtlibs/files/digest-emul-linux-x86-qtlibs-3.4.4-r5 b/app-emulation/emul-linux-x86-qtlibs/files/digest-emul-linux-x86-qtlibs-3.4.4-r5 new file mode 100644 index 000000000000..8ab25e9f5059 --- /dev/null +++ b/app-emulation/emul-linux-x86-qtlibs/files/digest-emul-linux-x86-qtlibs-3.4.4-r5 @@ -0,0 +1,12 @@ +MD5 1fde2f3ba5fcc5c14ce88e6f5df3e258 emul-linux-x86-qtlibs-3.4.4-r3-emul.patch.bz2 150442 +RMD160 1484b94ea1ff403acd9ccb86392f2efa28333441 emul-linux-x86-qtlibs-3.4.4-r3-emul.patch.bz2 150442 +SHA256 f809afcba27f2b8726847142864b85b9d0a3b0fffed360516906f85c19e73129 emul-linux-x86-qtlibs-3.4.4-r3-emul.patch.bz2 150442 +MD5 4456a40f8399aaf59258a2298de2db29 emul-linux-x86-qtlibs-extras-3.4.4.tar.bz2 1220350 +RMD160 2cd67c380890710af1d73c519071b88b6a57255e emul-linux-x86-qtlibs-extras-3.4.4.tar.bz2 1220350 +SHA256 5f7251066ed911f196566237cef58f57daa168325f275fc31d2a71dbe5b45250 emul-linux-x86-qtlibs-extras-3.4.4.tar.bz2 1220350 +MD5 0184a38bd9a99985a8e652c760b193d4 emul-linux-x86-qtlibs-immqt-3.4.4.tar.bz2 2856088 +RMD160 df6af24c090c6989f64d380993d8ef6680b48c14 emul-linux-x86-qtlibs-immqt-3.4.4.tar.bz2 2856088 +SHA256 c743e70ecfa66d72eb796f0ed314663587e5c7cf0cf3c7b9f14d0ab79c69bc36 emul-linux-x86-qtlibs-immqt-3.4.4.tar.bz2 2856088 +MD5 587c5fd13de2fe65557278a9f078faa3 emul-linux-x86-qtlibs-noime-3.4.4.tar.bz2 2792643 +RMD160 db06ed120a8633cd3bf196c5bfea8e0e484aa34a emul-linux-x86-qtlibs-noime-3.4.4.tar.bz2 2792643 +SHA256 acc33a4e8b4cb40d1144680517e7e4814993e6b7d33a90eefded0cfd017b52f9 emul-linux-x86-qtlibs-noime-3.4.4.tar.bz2 2792643