From e81be125d71476d30eeb3cd3c004df34dab19aa0 Mon Sep 17 00:00:00 2001 From: Matti Bickel Date: Wed, 18 Apr 2007 18:40:53 +0000 Subject: [PATCH] multilib and elog fix Package-Manager: portage-2.1.2.4 --- x11-libs/fxscintilla/ChangeLog | 6 +++- x11-libs/fxscintilla/Manifest | 34 +++++++++++------- .../fxscintilla/fxscintilla-1.62-r2.ebuild | 20 +++++------ x11-libs/fxscintilla/fxscintilla-1.71.ebuild | 36 +++++++++---------- 4 files changed, 53 insertions(+), 43 deletions(-) diff --git a/x11-libs/fxscintilla/ChangeLog b/x11-libs/fxscintilla/ChangeLog index 3a408d825005..6dec2d7256ce 100644 --- a/x11-libs/fxscintilla/ChangeLog +++ b/x11-libs/fxscintilla/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/fxscintilla # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/ChangeLog,v 1.25 2007/03/10 22:29:34 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/ChangeLog,v 1.26 2007/04/18 18:40:53 mabi Exp $ + + 18 Apr 2007; Matti Bickel fxscintilla-1.62-r2.ebuild, + fxscintilla-1.71.ebuild: + multilib-strict and elog fixes 10 Mar 2007; Tom Gall fxscintilla-1.71.ebuild: added ~ppc64 diff --git a/x11-libs/fxscintilla/Manifest b/x11-libs/fxscintilla/Manifest index 3b7bcb4eff17..982d4d9390f7 100644 --- a/x11-libs/fxscintilla/Manifest +++ b/x11-libs/fxscintilla/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 1.62-fox-SLOT.patch 2860 RMD160 f05b9b6e5bd33412f6e2fcb903566401981372ed SHA1 ca0de639985331a5c08c2610e955801dab61c99e SHA256 497d18ba399da33d755f493a3cf87b6fbfb9e13e978809766b87bab527559d4e MD5 ef5d7591d22f5da1c452bf84050dee19 files/1.62-fox-SLOT.patch 2860 RMD160 f05b9b6e5bd33412f6e2fcb903566401981372ed files/1.62-fox-SLOT.patch 2860 @@ -16,22 +19,22 @@ RMD160 7058dc9eb7ba64c8c22f22443f57561a78c2d61d files/1.71-shared-libs.patch 619 SHA256 bbbd6aed2f6cd32cdbb9a5b728f2dfdb3ee6892488019f2d3582c75d26cda38b files/1.71-shared-libs.patch 619 DIST fxscintilla-1.62.tar.gz 833249 RMD160 fa191090b252d5f631a7a9d0d935749bb3a9c246 SHA1 062cd169c4fa43f751c0fede2367a735276440a7 SHA256 5db9a3b17bee7f8e4b4f877d57e253bee7122e5b081adb41791faabba25c194c DIST fxscintilla-1.71.tar.gz 887017 RMD160 83e8eb50c7ee98d83600eda846a71ce90896ae4e SHA1 46301c713afa1962098af90fcf43ad8836439dc1 SHA256 882c91f025699ee2496d0dfd37ef21dda40e9a7fff796d0f4091c03390716d7d -EBUILD fxscintilla-1.62-r2.ebuild 1737 RMD160 d40e44fa4c93427a5a8fd2bdf2efb08e647167ac SHA1 4c7fa6613c780e41902f52cacde3398bb96aeae0 SHA256 bdfc750fd39fb33bfc8b83099094bcb39af04ac1cdaaf964a220e694c60e7bd1 -MD5 8ca1c63dac6be12722b792b30d136118 fxscintilla-1.62-r2.ebuild 1737 -RMD160 d40e44fa4c93427a5a8fd2bdf2efb08e647167ac fxscintilla-1.62-r2.ebuild 1737 -SHA256 bdfc750fd39fb33bfc8b83099094bcb39af04ac1cdaaf964a220e694c60e7bd1 fxscintilla-1.62-r2.ebuild 1737 +EBUILD fxscintilla-1.62-r2.ebuild 1725 RMD160 99df7655a3ecd303a81999744f04ca403a05f81e SHA1 78047b9ef5bfa04a95526ee0b8206cbfb937ce55 SHA256 b8ed8dd11f7bb671b33db578cd4d1409a1dac46ec2e49ae8dc8f0860c8ef6537 +MD5 ca5b49490e872526a989f5aa10ce2890 fxscintilla-1.62-r2.ebuild 1725 +RMD160 99df7655a3ecd303a81999744f04ca403a05f81e fxscintilla-1.62-r2.ebuild 1725 +SHA256 b8ed8dd11f7bb671b33db578cd4d1409a1dac46ec2e49ae8dc8f0860c8ef6537 fxscintilla-1.62-r2.ebuild 1725 EBUILD fxscintilla-1.62.ebuild 1057 RMD160 505a38d6b310afa670b203d9f41b70f38002ff43 SHA1 1501f620211cdd919ebba6d16be9e372f2a09569 SHA256 229ed47be42b9b8a8ac40b0cd0733cb55627fbc48146230356e20a83a6c857a7 MD5 cbcb7f1b0a5d5fd7fc44b38ead86b59a fxscintilla-1.62.ebuild 1057 RMD160 505a38d6b310afa670b203d9f41b70f38002ff43 fxscintilla-1.62.ebuild 1057 SHA256 229ed47be42b9b8a8ac40b0cd0733cb55627fbc48146230356e20a83a6c857a7 fxscintilla-1.62.ebuild 1057 -EBUILD fxscintilla-1.71.ebuild 2771 RMD160 6efc620ab58654b0d08e148706a59e96ed606ea9 SHA1 813d75a69ff67482554c8e3fe4b798cc337d2514 SHA256 c5e76c8dc0aadb9486379b7520844503e358190c67fedd3e2f030eacb238a762 -MD5 fecfe14ee768218b802d75bb429d2294 fxscintilla-1.71.ebuild 2771 -RMD160 6efc620ab58654b0d08e148706a59e96ed606ea9 fxscintilla-1.71.ebuild 2771 -SHA256 c5e76c8dc0aadb9486379b7520844503e358190c67fedd3e2f030eacb238a762 fxscintilla-1.71.ebuild 2771 -MISC ChangeLog 3515 RMD160 bdf791c45d0ec4ffd0cd36ca625c68732fd5f10d SHA1 e74fe42c31d926016130d9c2afd55d90e374367d SHA256 9817e0fd5338509e6a4ed3f145556e2e37e05eaf857e9c9f7588af1d51742e2c -MD5 1c617d53f5707306b0106c69b1186adb ChangeLog 3515 -RMD160 bdf791c45d0ec4ffd0cd36ca625c68732fd5f10d ChangeLog 3515 -SHA256 9817e0fd5338509e6a4ed3f145556e2e37e05eaf857e9c9f7588af1d51742e2c ChangeLog 3515 +EBUILD fxscintilla-1.71.ebuild 2786 RMD160 4dedd8b98a5df2d22916ab0f8ae60bf002c733f3 SHA1 e42970ce6f40a6c081cedb10d27fec2fb7d31203 SHA256 3530f0cd9e0cd3c47b476cb4cd7760adf3920e6530d9b21da533971530075aea +MD5 f6ff3b386e1d9a797ed7ddeb54c3516d fxscintilla-1.71.ebuild 2786 +RMD160 4dedd8b98a5df2d22916ab0f8ae60bf002c733f3 fxscintilla-1.71.ebuild 2786 +SHA256 3530f0cd9e0cd3c47b476cb4cd7760adf3920e6530d9b21da533971530075aea fxscintilla-1.71.ebuild 2786 +MISC ChangeLog 3649 RMD160 ae3f3bc62887ba4366ebaa645a8d5fdd5437e895 SHA1 e29c6ec5433d234a24acec69bfc0b19b073a5516 SHA256 96e9bfc69089d9b5a036ec59278503fbf0949289232b5d0e6ebb223174c90b0c +MD5 4aee363ef11e2c7068145232c445bfad ChangeLog 3649 +RMD160 ae3f3bc62887ba4366ebaa645a8d5fdd5437e895 ChangeLog 3649 +SHA256 96e9bfc69089d9b5a036ec59278503fbf0949289232b5d0e6ebb223174c90b0c ChangeLog 3649 MISC metadata.xml 251 RMD160 de7b9e460e271383d650cd8efd770f385bc35c9d SHA1 0ba87804547dc299c7742e1c1edbb4bbf02672a1 SHA256 2781d5311b471992f2b3b9bdbb16e86cef1dab7ee1964e16f61d2bdcda55ebc6 MD5 cf5d41703c1fa350b5959973d388cc3c metadata.xml 251 RMD160 de7b9e460e271383d650cd8efd770f385bc35c9d metadata.xml 251 @@ -45,3 +48,10 @@ SHA256 2c0418c743f616f1c30e22467fbd91dfc70f0d6fcdde84344a80ba7f05b9d72d files/di MD5 061be73cd9c2b569ef067ad66f57d24a files/digest-fxscintilla-1.71 250 RMD160 4522fc3db8e7dc7f40822dd41455a8ec65be4ab7 files/digest-fxscintilla-1.71 250 SHA256 9f218e6365f087e663ac14a82459e0264ab0c8de08ed916d502003478c628603 files/digest-fxscintilla-1.71 250 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFGJmYIfNMcoUhJ7GwRAq30AJ9oWveze7Ev3lTRJDhEsI5TduJ5lgCeOP3h +gYyGqD/AbX5AxIRTXLuP2Zo= +=bt32 +-----END PGP SIGNATURE----- diff --git a/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild b/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild index 1c897212888e..660f0c48a22b 100644 --- a/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild +++ b/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild,v 1.2 2007/02/23 16:24:46 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild,v 1.3 2007/04/18 18:40:53 mabi Exp $ inherit eutils @@ -36,7 +36,7 @@ src_compile () { ../configure \ --prefix=/usr \ --includedir=/usr/include \ - --libdir=/usr/lib \ + --libdir="/usr/$(get_libdir)" \ ${EXTRA_ECONF} \ --enable-nolexer \ --with-foxinclude=/usr/include \ @@ -58,13 +58,11 @@ src_install () { } pkg_postinst() { - ewarn - ewarn "New as of 1.62-r2:" - ewarn "FXScintilla is now built only against FOX-1.2." - ewarn "For FOX-1.2, the library is called libfxscintilla-1.2." - ewarn "Anything linked against previous releases of FOX-1.2 and fxscintilla" - ewarn "may need to be rebuilt." - ewarn - einfo "The nolexer libraries are now included in this release as well." - epause 5 + elog "New as of 1.62-r2:" + elog "FXScintilla is now built only against FOX-1.2." + elog "For FOX-1.2, the library is called libfxscintilla-1.2." + elog "Anything linked against previous releases of FOX-1.2 and fxscintilla" + elog "may need to be rebuilt." + elog + elog "The nolexer libraries are now included in this release as well." } diff --git a/x11-libs/fxscintilla/fxscintilla-1.71.ebuild b/x11-libs/fxscintilla/fxscintilla-1.71.ebuild index 127511045c7c..27e46081c2f7 100644 --- a/x11-libs/fxscintilla/fxscintilla-1.71.ebuild +++ b/x11-libs/fxscintilla/fxscintilla-1.71.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.71.ebuild,v 1.10 2007/03/10 22:29:34 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.71.ebuild,v 1.11 2007/04/18 18:40:53 mabi Exp $ -inherit eutils +inherit eutils multilib DESCRIPTION="A free source code editing component for the FOX-Toolkit" HOMEPAGE="http://www.nongnu.org/fxscintilla/" @@ -38,7 +38,7 @@ src_compile () { ../configure \ --prefix=/usr \ --includedir=/usr/include \ - --libdir=/usr/lib \ + --libdir=/usr/$(get_libdir) \ ${EXTRA_ECONF} \ --enable-nolexer \ --with-fox-1-2 \ @@ -53,7 +53,7 @@ src_compile () { ../configure \ --prefix=/usr \ --includedir=/usr/include \ - --libdir=/usr/lib \ + --libdir=/usr/$(get_libdir) \ ${EXTRA_ECONF} \ --enable-nolexer \ --with-fox-1-4 \ @@ -68,7 +68,7 @@ src_compile () { ../configure \ --prefix=/usr \ --includedir=/usr/include \ - --libdir=/usr/lib \ + --libdir=/usr/$(get_libdir) \ ${EXTRA_ECONF} \ --enable-nolexer \ --with-fox-1-6 \ @@ -79,13 +79,13 @@ src_compile () { src_install () { cd ${S}/build_1_2 - make DESTDIR="${D}" install || die "make install error" + emake DESTDIR="${D}" install || die "make install error" cd ${S}/build_1_4 - make DESTDIR="${D}" install || die "make install error" + emake DESTDIR="${D}" install || die "make install error" cd ${S}/build_1_6 - make DESTDIR="${D}" install || die "make install error" + emake DESTDIR="${D}" install || die "make install error" cd ${S} dodoc README @@ -96,15 +96,13 @@ src_install () { } pkg_postinst() { - ewarn - ewarn "New as of 1.71:" - ewarn "FXScintilla is now built separately against FOX-1.2,-1.4 and -1.6." - ewarn "Support for FOX-1.0 has been dropped upstream." - ewarn "The Librarys are named for the FOX-release they correspond to, for" - ewarn "example: For FOX-1.2, the library is called libfxscintilla-1.2." - ewarn "Anything linked against previous releases of FOX and fxscintilla" - ewarn "may need to be rebuilt." - ewarn - einfo "The nolexer libraries are now included in this release as well." - epause 5 + elog "New as of 1.71:" + elog "FXScintilla is now built separately against FOX-1.2,-1.4 and -1.6." + elog "Support for FOX-1.0 has been dropped upstream." + elog "The Librarys are named for the FOX-release they correspond to, for" + elog "example: For FOX-1.2, the library is called libfxscintilla-1.2." + elog "Anything linked against previous releases of FOX and fxscintilla" + elog "may need to be rebuilt." + elog + elog "The nolexer libraries are now included in this release as well." } -- 2.26.2