From a09e54a41c663dd1af9589100446b6c6dda1b25e Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 5 Dec 2011 17:49:15 +0000 Subject: [PATCH] Fix for real multilib without symlink lib -> /usr/lib64, #392947; ebuild cleaning Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64 --- dev-tcltk/iwidgets/ChangeLog | 7 ++++++- dev-tcltk/iwidgets/Manifest | 18 +++++++++--------- dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild | 20 ++++++++++++-------- dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild | 10 ++++++---- dev-tcltk/iwidgets/metadata.xml | 2 +- 5 files changed, 34 insertions(+), 23 deletions(-) diff --git a/dev-tcltk/iwidgets/ChangeLog b/dev-tcltk/iwidgets/ChangeLog index b81991e3253a..0b9e5193934a 100644 --- a/dev-tcltk/iwidgets/ChangeLog +++ b/dev-tcltk/iwidgets/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-tcltk/iwidgets # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/ChangeLog,v 1.22 2011/06/23 15:16:17 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/ChangeLog,v 1.23 2011/12/05 17:49:15 jlec Exp $ + + 05 Dec 2011; Justin Lecher iwidgets-4.0.1.ebuild, + iwidgets-4.0.1-r3.ebuild, metadata.xml: + Fix for real multilib without symlink lib -> /usr/lib64, #392947; ebuild + cleaning *iwidgets-4.0.1-r3 (23 Jun 2011) diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest index 450c237669e0..73230b2e5272 100644 --- a/dev-tcltk/iwidgets/Manifest +++ b/dev-tcltk/iwidgets/Manifest @@ -1,17 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX 4.0.1-path.patch 2376 RMD160 4601a24f5db5299a2c053bc8b667d32bb5565458 SHA1 6eb0867d92e98ba78b4abf776636231f2f4aa58a SHA256 496efbba07ca1e62a27129807a569d5d346e1fc68e380b3bec942404d0dd7847 DIST itcl3.2.1_src.tgz 427026 RMD160 6a6bbc5596e3c7b8bfd6783533d26d07b1c3a7c1 SHA1 890f56e61826a9c3522fb24bf3c08f73cea8a1dd SHA256 9a225564fc94beef4cc0e627a368d9d2b4425c58b93d5a787c9836d6cceed2ad DIST iwidgets4.0.1.tar.gz 647960 RMD160 d680c36b10958cb9df325bdfab8a4dd57f71cac9 SHA1 e08e057ba15ba9e10cb809a935d585a57820d43c SHA256 b0e9cb74370f863e17a05df81fd70af3a39a1cfb733181c61669b30ad7799426 -EBUILD iwidgets-4.0.1-r3.ebuild 1520 RMD160 c7cb1413e793129deebbdbd52ede076ce7fde3f8 SHA1 e94a70793dca5c520c62c1691652b5dd1494507a SHA256 2b133190ce25f701e5e8d70bd41597cdf18756d8cac06350052e9074c0284365 -EBUILD iwidgets-4.0.1.ebuild 956 RMD160 dcd94754a7c1f58d7ad1051b9bf188f25c3c4746 SHA1 389997995ddcc1d7eea8e146ed471c1970996af7 SHA256 1500246b92f1c87233b6196a5637566830e04dbf4f503b88b7138fc1ac1496b7 -MISC ChangeLog 2746 RMD160 03998733d9016a8edd01b44fa39555aef4f15aea SHA1 e80beb6dc9f329b9b8c2e68ed6aff4a7da673334 SHA256 7a73c876b3694539468d7030b840b7f4b6d40fd53650df55ed192a78a7ae4913 -MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 +EBUILD iwidgets-4.0.1-r3.ebuild 1526 RMD160 235905a7475ac7fcb2272002a9eeb7546b46d8f3 SHA1 b9477b5c87b5eafa7d4569c32ef007d275bf25b5 SHA256 ce1ea0b691b566943ab13ecd154fdac3c2740ba4fb3db59e094a2f31fd109936 +EBUILD iwidgets-4.0.1.ebuild 960 RMD160 a8755ed23cdc6a93c4bb42de6f516ad627791148 SHA1 3b4347a01719d5655405a3484a42c8e71a0915fe SHA256 4541865cf5948e1e05e5da32e2eee74b0f97058c03ccb1120de87d957115cf69 +MISC ChangeLog 2945 RMD160 994ec77fc9112f61f3402707140501f1a6b7c500 SHA1 56536b5a0bd0c3fef330724a7bb8ae937d7c65a8 SHA256 89ded91d1725dbe84793a8c1af2c23c13ca46b7c6e631fdb31e39ce5d856b398 +MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4DWNAACgkQgAnW8HDreRZ5cwCgtQKhbAqR5FA/Dx8hwiSPBAfl -LZIAn1TgzTBt1sQwSV6tkUmu0ardQTvD -=EtSX +iEYEAREKAAYFAk7dBCEACgkQgAnW8HDreRbNMACggjrIdk5uzsQpi8Z8hs7yZP3t +AUwAnislMRC+HXaonzXsFbP6P/T+0Y43 +=Hx7v -----END PGP SIGNATURE----- diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild index fc3feac2dce4..d330d1c6b36f 100644 --- a/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild +++ b/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild,v 1.1 2011/06/23 15:16:17 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/iwidgets-4.0.1-r3.ebuild,v 1.2 2011/12/05 17:49:15 jlec Exp $ -EAPI="3" +EAPI=4 inherit eutils multilib @@ -11,7 +11,8 @@ ITCL_MY_P="itcl3.2.1" DESCRIPTION="Widget collection for incrTcl/incrTk" HOMEPAGE="http://incrtcl.sourceforge.net/itcl/" -SRC_URI="mirror://sourceforge/incrtcl/${MY_P}.tar.gz +SRC_URI=" + mirror://sourceforge/incrtcl/${MY_P}.tar.gz mirror://sourceforge/incrtcl/${ITCL_MY_P}_src.tgz" LICENSE="as-is BSD" @@ -28,16 +29,19 @@ S="${WORKDIR}/${MY_P}" src_prepare() { epatch "${FILESDIR}"/${PV}-path.patch - sed -i -e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \ - Makefile.in || die + sed \ + -e "/^\(LIB\|SCRIPT\)_INSTALL_DIR =/s|lib|$(get_libdir)|" \ + -i Makefile.in || die # Bug 115470 rm doc/panedwindow.n } src_configure() { - econf --with-itcl="${WORKDIR}/${ITCL_MY_P}" || die "configure failed" - # we don't need to compile anything + econf \ + --with-itcl="${WORKDIR}/${ITCL_MY_P}" \ + --with-tcl="${EPREFIX}"/usr/$(get_libdir) \ + --with-tk="${EPREFIX}"/usr/$(get_libdir) } src_compile() { @@ -46,7 +50,7 @@ src_compile() { src_install() { # parallel borks #177088 - emake -j1 INSTALL_ROOT="${D}" install || die "emake install failed" + emake -j1 INSTALL_ROOT="${D}" install dodoc CHANGES ChangeLog README diff --git a/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild b/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild index 8371a1b822fa..a9aa74edb49f 100644 --- a/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild +++ b/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild,v 1.19 2010/12/07 19:57:50 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/iwidgets/iwidgets-4.0.1.ebuild,v 1.20 2011/12/05 17:49:15 jlec Exp $ MY_P=${PN}${PV} ITCL_MY_PN="itcl" @@ -9,7 +9,8 @@ ITCL_MY_P="${ITCL_MY_PN}${ITCL_MY_PV}" DESCRIPTION="Widget collection for incrTcl/incrTk" HOMEPAGE="http://incrtcl.sourceforge.net/itcl/" -SRC_URI="mirror://sourceforge/incrtcl/${MY_P}.tar.gz +SRC_URI=" + mirror://sourceforge/incrtcl/${MY_P}.tar.gz mirror://sourceforge/incrtcl/${ITCL_MY_P}_src.tgz" LICENSE="as-is BSD" @@ -17,7 +18,8 @@ SLOT="0" KEYWORDS="~alpha amd64 ia64 ppc sparc x86" IUSE="" -DEPEND=">=dev-tcltk/itcl-3.2.1 +DEPEND=" + >=dev-tcltk/itcl-3.2.1 >=dev-tcltk/itk-3.3-r1" RDEPEND="${DEPEND}" diff --git a/dev-tcltk/iwidgets/metadata.xml b/dev-tcltk/iwidgets/metadata.xml index d9408d8ab078..815cc916f2b6 100644 --- a/dev-tcltk/iwidgets/metadata.xml +++ b/dev-tcltk/iwidgets/metadata.xml @@ -1,5 +1,5 @@ -tcltk + tcltk -- 2.26.2