diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2008-07-18 06:35:01 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2008-07-18 06:35:01 +0000 |
| commit | a2e3b71ff26d188481fc34e33d780492d4cc2399 (patch) | |
| tree | 40b2c7e6d7d222f25bff62cee7b2e8f273b99992 /x11-libs | |
| parent | stable x86, bug 232153 (diff) | |
| download | historical-a2e3b71ff26d188481fc34e33d780492d4cc2399.tar.gz historical-a2e3b71ff26d188481fc34e33d780492d4cc2399.tar.bz2 historical-a2e3b71ff26d188481fc34e33d780492d4cc2399.zip | |
Apply LIBS fix by Bernd Steinhauser (bug #224569). Marked ~hppa (bug #223557).
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r2-JeR i686
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-demo/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt-demo/Manifest | 15 | ||||
| -rw-r--r-- | x11-libs/qt-demo/qt-demo-4.4.0.ebuild | 6 |
3 files changed, 10 insertions, 16 deletions
diff --git a/x11-libs/qt-demo/ChangeLog b/x11-libs/qt-demo/ChangeLog index 7b5ec4e63363..79420831fd82 100644 --- a/x11-libs/qt-demo/ChangeLog +++ b/x11-libs/qt-demo/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-demo # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.3 2008/06/13 23:21:15 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/ChangeLog,v 1.4 2008/07/18 06:35:01 jer Exp $ + + 18 Jul 2008; Jeroen Roovers <jer@gentoo.org> qt-demo-4.4.0.ebuild: + Apply LIBS fix by Bernd Steinhauser (bug #224569). Marked ~hppa (bug #223557). 13 Jun 2008; Ingmar Vanhassel <ingmar@gentoo.org> qt-demo-4.4.0.ebuild: Make all split Qt4 ebuilds block the old monolithic ebuild. diff --git a/x11-libs/qt-demo/Manifest b/x11-libs/qt-demo/Manifest index 0d88a527c59d..5e5ee83e8608 100644 --- a/x11-libs/qt-demo/Manifest +++ b/x11-libs/qt-demo/Manifest @@ -1,15 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST qt-x11-opensource-src-4.4.0-headers.tar.bz2 2531285 RMD160 5cf74dd7e5864420abc5ebb725ed824854d1d0d2 SHA1 7ea8a69fb5d7bd757d3fc8ea5a91d5b738fec43a SHA256 edca0e755c3e63d514dbe94a5d1c532937412c8019c339bc68f824e031ab8ef2 DIST qt-x11-opensource-src-4.4.0.tar.bz2 98584925 RMD160 ddcfe3390e65761a45a6112a8466b3b1e22cc584 SHA1 71acc53f5ec7bdc6abbc85409568d0d006a040e3 SHA256 871dc71c6c905212f2fea7e6598362114a3b6097c220b0b251f8d159ee7d706e -EBUILD qt-demo-4.4.0.ebuild 1440 RMD160 13f900fbfe825c786e6202abe9be28fdb70cc83a SHA1 46219d0481abe64bb4224966484f58db52805c9b SHA256 5db642ddd9083534bab68f9ed9cc041350f4623f03e1473333f918e31222ad45 -MISC ChangeLog 652 RMD160 2a0c77957d20efa840d0cc9b1132c12939526804 SHA1 8468208f605809bb71b572034ad39b3d2d255e19 SHA256 ada17dd3dc74d235c0bce93ea735caa23b1adacf0d90afca9621011e1ee08002 +EBUILD qt-demo-4.4.0.ebuild 1414 RMD160 747d614558a0b4a3bd9e3103feedd70a6cd75d0c SHA1 94c1fece0a748e86b25798292e17a7329b189ede SHA256 b4bd7719b56839d0d96ebf50662441a44a9f4c9f5553fd6797d18cb2a6d6a679 +MISC ChangeLog 800 RMD160 c5a09460486f997c759d8d19c651d31ddba86824 SHA1 a94edb8e4f431b6bc2b4e7faff9c4393d383d07a SHA256 e54ad245ebc0ae4ecf695d7290a86180e77843b1378a4e90e6d674f718c11f15 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkhTAK8ACgkQB18eXLOpYdnryQCfco/d1aBmA82l226ijw3e2KvG -bTcAn2T3h9OWp4NlNnagCAhxIEL+jC70 -=gHc0 ------END PGP SIGNATURE----- +MISC qt-demo-4.4.0.ebuild.orig 1440 RMD160 13f900fbfe825c786e6202abe9be28fdb70cc83a SHA1 46219d0481abe64bb4224966484f58db52805c9b SHA256 5db642ddd9083534bab68f9ed9cc041350f4623f03e1473333f918e31222ad45 diff --git a/x11-libs/qt-demo/qt-demo-4.4.0.ebuild b/x11-libs/qt-demo/qt-demo-4.4.0.ebuild index 71111599e55d..3639c1f075dd 100644 --- a/x11-libs/qt-demo/qt-demo-4.4.0.ebuild +++ b/x11-libs/qt-demo/qt-demo-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.4.0.ebuild,v 1.3 2008/06/13 23:21:15 ingmar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-demo/qt-demo-4.4.0.ebuild,v 1.4 2008/07/18 06:35:01 jer Exp $ EAPI="1" inherit qt4-build @@ -10,7 +10,7 @@ HOMEPAGE="http://www.trolltech.com/" LICENSE="|| ( QPL-1.0 GPL-3 GPL-2 )" SLOT="4" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~hppa ~ppc64" IUSE="" DEPEND=" @@ -38,7 +38,7 @@ QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} src_compile() { # Doesn't find qt-gui and fails linking - sed -e '/QT_BUILD_TREE/ a LIBS+=-L/usr/lib64/qt4\n' \ + sed -e '/QT_BUILD_TREE/ s:=:+=:' \ -i "${S}"/examples/tools/plugandpaint/plugandpaint.pro \ || die "Fixing plugandpaint example failed." |