From 137fab0e64127422724ac1edcbdc31005dd9aaa7 Mon Sep 17 00:00:00 2001 From: Matti Bickel Date: Fri, 23 Feb 2007 16:24:46 +0000 Subject: [PATCH] ${ROOT} fix (bug #168044) and cleanup Package-Manager: portage-2.1.2-r10 --- x11-libs/fxscintilla/ChangeLog | 6 +- x11-libs/fxscintilla/Manifest | 41 +++++---- .../files/digest-fxscintilla-1.62-r1 | 3 - .../fxscintilla/fxscintilla-1.62-r1.ebuild | 89 ------------------- .../fxscintilla/fxscintilla-1.62-r2.ebuild | 8 +- x11-libs/fxscintilla/fxscintilla-1.71.ebuild | 8 +- 6 files changed, 35 insertions(+), 120 deletions(-) delete mode 100644 x11-libs/fxscintilla/files/digest-fxscintilla-1.62-r1 delete mode 100644 x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild diff --git a/x11-libs/fxscintilla/ChangeLog b/x11-libs/fxscintilla/ChangeLog index 73bb8a6cadd9..33336de505f5 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.23 2007/02/05 09:00:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/ChangeLog,v 1.24 2007/02/23 16:24:46 mabi Exp $ + + 23 Feb 2007; Matti Bickel -fxscintilla-1.62-r1.ebuild, + fxscintilla-1.62-r2.ebuild, fxscintilla-1.71.ebuild: + ${ROOT} fix (bug #168044) and cleanup 05 Feb 2007; Jeroen Roovers fxscintilla-1.71.ebuild: Stable for HPPA. diff --git a/x11-libs/fxscintilla/Manifest b/x11-libs/fxscintilla/Manifest index 8c10446b721b..9cdd64c8d557 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,26 +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-r1.ebuild 2223 RMD160 e96b367e828fb3ed2dac30ccc2af05f627904eb1 SHA1 90740fe689f45290775be30b363d7e535942825d SHA256 42d33e1a1449728e667982882647e6fc0f4dada32da3f41705c09ff2847d72be -MD5 4aa3ba12298f0fcffc26e57cade8a3b7 fxscintilla-1.62-r1.ebuild 2223 -RMD160 e96b367e828fb3ed2dac30ccc2af05f627904eb1 fxscintilla-1.62-r1.ebuild 2223 -SHA256 42d33e1a1449728e667982882647e6fc0f4dada32da3f41705c09ff2847d72be fxscintilla-1.62-r1.ebuild 2223 -EBUILD fxscintilla-1.62-r2.ebuild 1749 RMD160 36af9ecf7d046ed8a0cf09c563a03d358c09c9f5 SHA1 4f105a082af5d5d79412688572e65a3b639a54ca SHA256 e4a985b267265487c3856bc6732f9d6cdd2d9810e015be5499887367374ac62e -MD5 c41678c088de0f0760836c280103bb98 fxscintilla-1.62-r2.ebuild 1749 -RMD160 36af9ecf7d046ed8a0cf09c563a03d358c09c9f5 fxscintilla-1.62-r2.ebuild 1749 -SHA256 e4a985b267265487c3856bc6732f9d6cdd2d9810e015be5499887367374ac62e fxscintilla-1.62-r2.ebuild 1749 +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.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 2791 RMD160 b745fa31fd0ee7eac1e08f4294d70500a112e753 SHA1 9489640eec9c462308cde87e0ba03edf87f30bbf SHA256 91b04d071c6a011613248b72b8536be8df26752a033a2b9ead9e13681cf6fc56 -MD5 4bf6366160697b90198947357642a60f fxscintilla-1.71.ebuild 2791 -RMD160 b745fa31fd0ee7eac1e08f4294d70500a112e753 fxscintilla-1.71.ebuild 2791 -SHA256 91b04d071c6a011613248b72b8536be8df26752a033a2b9ead9e13681cf6fc56 fxscintilla-1.71.ebuild 2791 -MISC ChangeLog 3258 RMD160 cf4fefa08a76976a68f565b0969bf7bdda87f805 SHA1 1d6d2b3659c499e3315effc6406a3827f2b89d9f SHA256 a3ad26e33ba62c98fe351cc0ef526524cda6bbcaa5c5d1faa8f7beba3682a620 -MD5 aa8d9d379f6f10b55acdcf7d34e453de ChangeLog 3258 -RMD160 cf4fefa08a76976a68f565b0969bf7bdda87f805 ChangeLog 3258 -SHA256 a3ad26e33ba62c98fe351cc0ef526524cda6bbcaa5c5d1faa8f7beba3682a620 ChangeLog 3258 +EBUILD fxscintilla-1.71.ebuild 2774 RMD160 f1fbb8f17d703c816884a7f6c7681e8bebb23bee SHA1 64d29340d284ea0655c3a9b588d1cdcaf0c4f6f5 SHA256 051f134919614152f1a800b7d6bc6e43849cfa9d9d4dfee7e8a0bbb44551b2af +MD5 c8e581cabd221917940d629d2b1460d3 fxscintilla-1.71.ebuild 2774 +RMD160 f1fbb8f17d703c816884a7f6c7681e8bebb23bee fxscintilla-1.71.ebuild 2774 +SHA256 051f134919614152f1a800b7d6bc6e43849cfa9d9d4dfee7e8a0bbb44551b2af fxscintilla-1.71.ebuild 2774 +MISC ChangeLog 3430 RMD160 f48a3be279b3fd06cf763d0674a5ed6adeaa53de SHA1 f7aa95b658037ea04809718438e7d68e5dca1ef0 SHA256 d173ceca84ca024b2fe617f70ae858e955af91a9c962deb063edf7bdac9078ed +MD5 42267670a2d88b2015a5a4f858a4882f ChangeLog 3430 +RMD160 f48a3be279b3fd06cf763d0674a5ed6adeaa53de ChangeLog 3430 +SHA256 d173ceca84ca024b2fe617f70ae858e955af91a9c962deb063edf7bdac9078ed ChangeLog 3430 MISC metadata.xml 251 RMD160 de7b9e460e271383d650cd8efd770f385bc35c9d SHA1 0ba87804547dc299c7742e1c1edbb4bbf02672a1 SHA256 2781d5311b471992f2b3b9bdbb16e86cef1dab7ee1964e16f61d2bdcda55ebc6 MD5 cf5d41703c1fa350b5959973d388cc3c metadata.xml 251 RMD160 de7b9e460e271383d650cd8efd770f385bc35c9d metadata.xml 251 @@ -43,12 +42,16 @@ SHA256 2781d5311b471992f2b3b9bdbb16e86cef1dab7ee1964e16f61d2bdcda55ebc6 metadata MD5 f65d7f222d71453f516edaa95898b183 files/digest-fxscintilla-1.62 250 RMD160 fc4969f726d90e4d1f6938dbdd4983aebe623741 files/digest-fxscintilla-1.62 250 SHA256 2c0418c743f616f1c30e22467fbd91dfc70f0d6fcdde84344a80ba7f05b9d72d files/digest-fxscintilla-1.62 250 -MD5 f65d7f222d71453f516edaa95898b183 files/digest-fxscintilla-1.62-r1 250 -RMD160 fc4969f726d90e4d1f6938dbdd4983aebe623741 files/digest-fxscintilla-1.62-r1 250 -SHA256 2c0418c743f616f1c30e22467fbd91dfc70f0d6fcdde84344a80ba7f05b9d72d files/digest-fxscintilla-1.62-r1 250 MD5 f65d7f222d71453f516edaa95898b183 files/digest-fxscintilla-1.62-r2 250 RMD160 fc4969f726d90e4d1f6938dbdd4983aebe623741 files/digest-fxscintilla-1.62-r2 250 SHA256 2c0418c743f616f1c30e22467fbd91dfc70f0d6fcdde84344a80ba7f05b9d72d files/digest-fxscintilla-1.62-r2 250 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) + +iD8DBQFF3xUgfNMcoUhJ7GwRAgWsAJ0YteSAun3NKY3FEPK/DRdceMKRNQCdHcj8 ++b0s9Od4z3f+1shJskrUDTU= +=lg5n +-----END PGP SIGNATURE----- diff --git a/x11-libs/fxscintilla/files/digest-fxscintilla-1.62-r1 b/x11-libs/fxscintilla/files/digest-fxscintilla-1.62-r1 deleted file mode 100644 index c584418c90d8..000000000000 --- a/x11-libs/fxscintilla/files/digest-fxscintilla-1.62-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c4cb1b9d954b92e1e1fdcb75597662c6 fxscintilla-1.62.tar.gz 833249 -RMD160 fa191090b252d5f631a7a9d0d935749bb3a9c246 fxscintilla-1.62.tar.gz 833249 -SHA256 5db9a3b17bee7f8e4b4f877d57e253bee7122e5b081adb41791faabba25c194c fxscintilla-1.62.tar.gz 833249 diff --git a/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild b/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild deleted file mode 100644 index 7e9fa2b7273b..000000000000 --- a/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.62-r1.ebuild,v 1.1 2005/05/07 19:40:49 rphillips Exp $ - -inherit eutils - -DESCRIPTION="A free source code editing component for the FOX-Toolkit" -HOMEPAGE="http://www.nongnu.org/fxscintilla/" -SRC_URI="http://savannah.nongnu.org/download/fxscintilla/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha" -IUSE="doc" - -DEPEND="=x11-libs/fox-1.0* - =x11-libs/fox-1.2*" - -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/1.62-shared-libs.patch || die - epatch ${FILESDIR}/1.62-fox-SLOT.patch || die - - einfo "Running autoreconf..." - touch NEWS AUTHORS - autoreconf --install --force || die "autoreconf error" -} - -src_compile () { - # Borrowed from wxGTK ebuild - - einfo "Building ${PN} for FOX-1.0..." - mkdir ${S}/build_1_0 - cd ${S}/build_1_0 - ../configure \ - --prefix=/usr \ - --includedir=/usr/include \ - --libdir=/usr/lib \ - ${EXTRA_ECONF} \ - --enable-nolexer \ - --with-fox-1-0 \ - --with-foxinclude=${ROOT}usr/include \ - --with-foxlib=${ROOT}usr/lib \ - || die "configure error" - emake || die "make error" - - einfo "Building ${PN} for FOX-1.2..." - mkdir ${S}/build_1_2 - cd ${S}/build_1_2 - ../configure \ - --prefix=/usr \ - --includedir=/usr/include \ - --libdir=/usr/lib \ - ${EXTRA_ECONF} \ - --enable-nolexer \ - --with-foxinclude=${ROOT}usr/include \ - --with-foxlib=${ROOT}usr/lib \ - || die "configure error" - emake || die "make error" -} - -src_install () { - cd ${S}/build_1_0 - make DESTDIR="${D}" install || die "make install error" - - cd ${S}/build_1_2 - make DESTDIR="${D}" install || die "make install error" - - cd ${S} - dodoc README - if use doc ; then - dodoc scintilla/doc/Lexer.txt - dohtml scintilla/doc/* - fi -} - -pkg_postinst() { - ewarn - ewarn "New as of 1.62-r1:" - ewarn "FXScintilla is now built separately against FOX-1.0 and 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 -} diff --git a/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild b/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild index 6344eb1f1b38..1c897212888e 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-2006 Gentoo Foundation +# 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.1 2006/12/18 22:46:52 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.62-r2.ebuild,v 1.2 2007/02/23 16:24:46 mabi Exp $ inherit eutils @@ -39,8 +39,8 @@ src_compile () { --libdir=/usr/lib \ ${EXTRA_ECONF} \ --enable-nolexer \ - --with-foxinclude=${ROOT}usr/include \ - --with-foxlib=${ROOT}usr/lib \ + --with-foxinclude=/usr/include \ + --with-foxlib=/usr/lib \ || die "configure error" emake || die "make error" } diff --git a/x11-libs/fxscintilla/fxscintilla-1.71.ebuild b/x11-libs/fxscintilla/fxscintilla-1.71.ebuild index b844ff76eeaf..f1b8a8341421 100644 --- a/x11-libs/fxscintilla/fxscintilla-1.71.ebuild +++ b/x11-libs/fxscintilla/fxscintilla-1.71.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.71.ebuild,v 1.7 2007/02/05 09:00:01 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/fxscintilla/fxscintilla-1.71.ebuild,v 1.8 2007/02/23 16:24:46 mabi Exp $ inherit eutils @@ -57,8 +57,8 @@ src_compile () { ${EXTRA_ECONF} \ --enable-nolexer \ --with-fox-1-4 \ - --with-foxinclude=${ROOT}usr/include \ - --with-foxlib=${ROOT}usr/lib \ + --with-foxinclude=/usr/include \ + --with-foxlib=/usr/lib \ || die "configure error" emake || die "make error" @@ -72,7 +72,7 @@ src_compile () { ${EXTRA_ECONF} \ --enable-nolexer \ --with-fox-1-6 \ - --with-foxinclude=${ROOT}usr/include \ + --with-foxinclude=/usr/include \ || die "configure error" emake || die "make error" } -- 2.26.2