diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-05-24 20:32:01 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-05-24 20:32:01 +0000 |
| commit | f43c804430614e8329210cbbd83e5389d2abc18d (patch) | |
| tree | 0e69e809bb839cbbae6b1feeacba51063440daeb /sys-apps/more | |
| parent | keyword ~amd64-fbsd thanks to Yuta SATOH, bug #432410 (diff) | |
| download | historical-f43c804430614e8329210cbbd83e5389d2abc18d.tar.gz historical-f43c804430614e8329210cbbd83e5389d2abc18d.tar.bz2 historical-f43c804430614e8329210cbbd83e5389d2abc18d.zip | |
fix static useflag by requiring ncurses[static-libs] by Yuta SATOH
Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'sys-apps/more')
| -rw-r--r-- | sys-apps/more/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/more/Manifest | 12 | ||||
| -rw-r--r-- | sys-apps/more/more-2.12r.ebuild | 19 |
3 files changed, 22 insertions, 16 deletions
diff --git a/sys-apps/more/ChangeLog b/sys-apps/more/ChangeLog index 66a0aa410c95..c88980ff0707 100644 --- a/sys-apps/more/ChangeLog +++ b/sys-apps/more/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/more -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/more/ChangeLog,v 1.5 2012/11/30 19:36:56 pacho Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/more/ChangeLog,v 1.6 2013/05/24 20:31:48 aballier Exp $ + + 24 May 2013; Alexis Ballier <aballier@gentoo.org> more-2.12r.ebuild: + fix static useflag by requiring ncurses[static-libs] by Yuta SATOH 30 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop maintainer due retirement, #178987 diff --git a/sys-apps/more/Manifest b/sys-apps/more/Manifest index 15696de52c3b..e8fa7aec138c 100644 --- a/sys-apps/more/Manifest +++ b/sys-apps/more/Manifest @@ -3,13 +3,13 @@ Hash: SHA256 AUX more-2.12r-freebsd.patch 1917 SHA256 41c3049929a2b1bd7cfa481fe7e740f41b1128c72aed8b4e434fced04ec233a2 SHA512 7148bf218cdcdcd9cd1f535713c3e2a7df0031fdca7aa75dcbaac99404d99cf3146c21423f1516890ec4006983d6031931b8e781f85aebe80782b861fe2e9526 WHIRLPOOL 9083aa91d8c4c4a4839c74e6ab33d688cee60edee1055654d8e1edc5c56efeb5a97d0f845139f4d928bd6eb9487bc7c3c2427458199ecfaf735be48e33b346b1 DIST util-linux-2.12r.tar.bz2 1370907 SHA256 b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b -EBUILD more-2.12r.ebuild 1584 SHA256 1661f76b45aa7e936e78d3768ad2ce0c18c562c7aefa68dc5bd507ddfde21604 SHA512 4c7cba79694ed20b5c561f7da69fd114892503dc037c10bc6c0b9681e9b4ce7ebf172f030086e4261ae8865fe2e78910983d4cb572bbef3fa301217756b3420d WHIRLPOOL dd15b3a5a3bb80eaa8535ae873f041051ee336e0c23357de6563f02d159aee308dc8fac298fa24fb057251de91f50289986511846450666a9a6bdcd3796101b7 -MISC ChangeLog 994 SHA256 3c7a6629399cfe1c19ac855f58887570332bdbe0e1420420384d038fa6b3c7d5 SHA512 c98453effc27b9e2054cefcf4a6f43d02e3626062551e5cb5cab4791416fd788b12d4cb9d7f3e9aaf85a913075dd32743f07235b7978092996395e5396ee32e5 WHIRLPOOL 84d81053d54e019865a104fd0150d58199fd5c77301777ae82cb96efe2816c19a5773b408cdaf6ccdd00534028c90e234a75aeeba2a52b28fdabec21161ed248 +EBUILD more-2.12r.ebuild 1653 SHA256 7643cb00b5337dda9ff78ddea41d0b47a8799c5cde96b93a6e2ac33ef284d04e SHA512 9d3c9c15a46b3aaacac1cad69d0a49306a537faf93db4661a2087fca5495bbd7769b329350465884daab14a7e59d20ce949fdd9f13945ff4d8942c40a7dc0da9 WHIRLPOOL aab79f163e66cb8ad8b14184ab4159f76689346ae624520cf9ea7c6d1bd770ae88c69dcb93d01ff11bfba14bc4842049cd67bbf94a91a955f3496b73de04da06 +MISC ChangeLog 1138 SHA256 7982e076982f2a587815ab84087ae5f3892837c099c1487dd0d72243f216fce9 SHA512 05fe3fc4e5456e0e3f55a453a1b061f1935e11b121298f96ef538b9567cc4cbb24317ddc50a4b01eb970787691ef2261c2a0b5c41331ce34342cd3d986c832f0 WHIRLPOOL bd9f16683807f355eca38146eb5571990c3a2ece702c92517c58f9b109bcaabf0003a6181ba45eebc3d37ae543e2731cf08fc3343af0e072a9a9b9ca57ed3bd8 MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlC5CtkACgkQCaWpQKGI+9RuAgCfWf5JTDomq627T+22zPiXJzmQ -6o4Anj8R/rOOGujrJ+pIoX1NOvWaNE7t -=Lsep +iEYEAREIAAYFAlGfzjUACgkQvFcC4BYPU0pQ+QCfaIL7sF9sZ+3CUFrAQ7fyuC/j +TX8An0vgo5AntWKs4wKcO+2TO7JKr4j7 +=R3Do -----END PGP SIGNATURE----- diff --git a/sys-apps/more/more-2.12r.ebuild b/sys-apps/more/more-2.12r.ebuild index 1ce625b6ef1e..fc813cbb32d3 100644 --- a/sys-apps/more/more-2.12r.ebuild +++ b/sys-apps/more/more-2.12r.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/more/more-2.12r.ebuild,v 1.4 2011/07/08 10:59:24 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/more/more-2.12r.ebuild,v 1.5 2013/05/24 20:31:48 aballier Exp $ + +EAPI=2 inherit eutils flag-o-matic @@ -14,18 +16,16 @@ SLOT="0" KEYWORDS="~x86-fbsd" IUSE="static nls selinux" -RDEPEND=">=sys-libs/ncurses-5.2-r2 +RDEPEND="!static? ( >=sys-libs/ncurses-5.2-r2 ) selinux? ( sys-libs/libselinux ) !sys-apps/util-linux" DEPEND="${RDEPEND} + static? ( >=sys-libs/ncurses-5.2-r2[static-libs] ) nls? ( sys-devel/gettext )" yesno() { use $1 && echo yes || echo no; } -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { epatch "${FILESDIR}"/${P}-freebsd.patch # Enable random features @@ -42,11 +42,14 @@ src_unpack() { ${mconfigs} || die "MCONFIG sed" } -src_compile() { +src_configure() { use static && append-ldflags -static export CC="$(tc-getCC)" econf || die "configure failed" +} + +src_compile() { emake -C lib xstrncpy.o || die "emake xstrncpy.o failed" emake -C text-utils more || die "emake more failed" } |