From 4c6b5e4ac0eac5bf630d4f1af9cb1d0f0bee3223 Mon Sep 17 00:00:00 2001 From: Manuel Rüger Date: Fri, 20 Feb 2015 14:41:30 +0000 Subject: Bump EAPI. Package-Manager: portage-2.2.17/cvs/Linux x86_64 --- x11-terms/rxvt/ChangeLog | 7 +++++-- x11-terms/rxvt/Manifest | 26 ++------------------------ x11-terms/rxvt/rxvt-2.7.10-r4.ebuild | 23 +++++++++-------------- 3 files changed, 16 insertions(+), 40 deletions(-) (limited to 'x11-terms') diff --git a/x11-terms/rxvt/ChangeLog b/x11-terms/rxvt/ChangeLog index 3ea4bf14b873..a64b8f5a6744 100644 --- a/x11-terms/rxvt/ChangeLog +++ b/x11-terms/rxvt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-terms/rxvt -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.70 2014/08/30 12:07:41 mgorny Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/ChangeLog,v 1.71 2015/02/20 14:41:26 mrueg Exp $ + + 20 Feb 2015; Manuel Rüger rxvt-2.7.10-r4.ebuild: + Bump EAPI. 30 Aug 2014; Michał Górny rxvt-2.7.10-r4.ebuild: Replace einstall with emake install, bug #521694. diff --git a/x11-terms/rxvt/Manifest b/x11-terms/rxvt/Manifest index a6937a6c376a..2a9df8ef49b4 100644 --- a/x11-terms/rxvt/Manifest +++ b/x11-terms/rxvt/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX rxvt-2.7.10-CVE-2008-1142-DISPLAY.patch 1850 SHA256 bcb38b2141d704799ae88ab1ba5004a4d4cec558d0f5231cb2eac74ba85f2c5c SHA512 037a7a2b3ab4c748ba02e8cb661d3bd5a40c493597f7ea8c0fe1196ab9c2f583e75bc77a0c6c44aded298fc37dd473313ab7fd4dfe33bfa4c2b9d1856226c14b WHIRLPOOL 75f27ed954bd63b287ce7b87973b34f9072b914aa88bb62f50e3aa1d96ad4cfc205b924757d1314a1e3d760858a80da281a21a447bf92f16c54f8f94b025b1b2 AUX rxvt-2.7.10-asneeded.patch 631 SHA256 a0e1c98c38affd0f1bf7275927719c488f997d456596c9557cf7484b1c31f69d SHA512 4ac46ef7cd18f2bf8743cd84590fe38fab3b7b3f97b34e2e0d3346bcf768ebf291f0c9d84806ee4602739b1194611282c249ab87efa4e2146f6cc2664fe5d0de WHIRLPOOL 392d1218c64bb3e5fddaf1e7067370e310968ef4898f30435ad7ab5af0618cba326b4963dbf07162bc0f8567aebf8908558c776a05c7e7d3b665dc1d29e0fc2d AUX rxvt-2.7.10-azz4.diff 5072 SHA256 7add72e2b7c28b7f21c12e66a32e3434df866ae2b02b429776f37f39925a2da2 SHA512 15bffbfc82ef94a2f9c7e6d36363181c50adf3ca252b23fe5687f00c8f4358febc90230ac626de9b4225acdf500311097ca6bd166df5da9df1fa059dc6fbfc0a WHIRLPOOL dbb45754469b0c88725435e10218094abcf1a62e582a9e53a9d8de94d2acdd62f5e7c80ccd1277313d800241dbfc470515df5fe9f06bf3320de7a8ad353e8b7f @@ -8,25 +5,6 @@ AUX rxvt-2.7.10-line-scroll.patch 432 SHA256 4d9c73d8b7408bfe162adc87934962e7eab AUX rxvt-2.7.10-rk.patch 2772 SHA256 03cd5fa32fa6cab6516a1b9d99957e1c81496849bba926414a3af1941e0deb33 SHA512 cb74e236c911ad96b80a602c2d741670ee6f74192a1e5c777789dc0d202b1518215f8dce007e2e733e0e503105077a7b55d07b2a5d922c010ebd296837f7ae0c WHIRLPOOL 5302793b919862fd5de9cf3009d137b6d9cbd1ad4084a42d4c1884221adb0e05d8cb08aa572d62850acc9bc8ff34e18316ac3fd46b4649935e900b8be7bb2e6b DIST rxvt-2.7.10-xim-fix.patch.gz 602 SHA256 09ba6a98927e0f60defc399acc0b0d4debfb95d69035d99c1aa779315c2573e9 SHA512 d2d65136c7ba630157eeab8234a1d7281f0cbb77817bb86974e91cdf154a815a637d314ae8f9e5d27c8a09a3d90e6be1a28d961e0e8e4b78bf6508da4a7e32ed WHIRLPOOL c584957a76ba9b6daaffbc33f92f6815a80c51f2da2faeb3e8ef5d5615b9a8d68bb3e439483c9ebc2e7eed68f69df2e3d2f4f31fef0ed0254aba971811aba09b DIST rxvt-2.7.10.tar.gz 595073 SHA256 616ad56502820264e6933d07bc4eb752aa6940ec14add6e780ffccf15f38d449 SHA512 cff86c2f94c533d906b412a949fe754726a0c67d87534b8f9794080898aa20744ee5de6f9109e9de1db14291cb6de7c1c4c1944ec9192e4ea42b0a3fe598b2a1 WHIRLPOOL 5c54110bd8ab79e3d8c23c447f5fce9631a9cd2492f816a1732eb8c2aab09eb1b31f61a0a6f0cfe3a456953fc4a3819b630a513cbd4b3b9f3fa4f95d526818fb -EBUILD rxvt-2.7.10-r4.ebuild 2340 SHA256 292061281bcaa827378bb6ae9565b8546acdea01e3ae1f36c8a2b015f6b913ed SHA512 6d195bccf97d9478f451fa91962aca13196573d3bdef12333accc55309a6274097fafe4c63f4f6ee7b058a6e8e85589126de1221196be0f7cf47d58d04b6dec6 WHIRLPOOL 040851ffcc9ab9347f5a86fbdeb6802793aa0c282f6aa74eaff7987bf6acb856775cb83442c781fc4957220636f784f1250381d6d25afe7c3550ced32b9e274e -MISC ChangeLog 10700 SHA256 3c150a8e7e7a3b111d3938d6c4e4f90967336b261ab9f7bffd03f44122e35efa SHA512 5379f01b983654013baf2890d4a1108f98f9ed464e147bd6f06cce76fb9990855990bb47aa9bf018338faf08861119b746a39314516fac852811102cbbf870ca WHIRLPOOL 961db97cd5083f050a9c0893bcfef5a3a39b86fb35df4b5561794f9887a66c560b59d17fc25ed09f913a45397a1894474fe0ad0dbae5ecd6968fb74141d8cb09 +EBUILD rxvt-2.7.10-r4.ebuild 2266 SHA256 57ba113726a44b1b74b6ea7d816c781bb40ca06caf5a46a71c8b755ff84a1089 SHA512 ccf44e7183ebbb90ab8a4ab98c8fec972a9443074d85f5dda7d7d0d78261107c5f412d5d26d28c6ed6b1aea0c86d98004b37ddd5c73c47ea78fab24cdfc573a5 WHIRLPOOL d9e663da930cfb525dea10511d3da9edb32b1c22ec1de83b0ac789281198ac5423f198feb7ec15c1cff369d367b0796da850e6d91b0d7cb74de5c493b684e81e +MISC ChangeLog 10784 SHA256 5eee143de8dd052fedc068ea95f60e83b31a3e08a025f92af135241b251347c4 SHA512 ce220dda3e43c8410d8cb629b1be042ea6cec972e4124177cf46465087cc90c05e417616ac58c733a76290ad0885c997f49aa7ae9570ff6dcde2cf7500349429 WHIRLPOOL 88ecb2e8cd31ca94ec0605c8f7767756bd3ca125779a5430d91f72869e3a6ea0525ff8b767af7696305e79831ade376e97b9dd31e86e78c397b748c3c5ca50d0 MISC metadata.xml 676 SHA256 6add43917581b9a75ec7a46ef31e0341b288ed9b4cd06b4f15ad37cbde304ea6 SHA512 43b943f7f1b9f4714172d720e88108a4fd31758d5e2cbef5107a6076ce12c62e166b3deeefbf4c928011c9f19207b8dde73236982d0a1b74f3e70be6feceaa6a WHIRLPOOL 325a5a22d8ee55445f35eaa75cef55727b4e7bae9f4a67eecaa29666c71bbcdace4e54406ba07c3d6b2f7c64d611335c12221480e5f6e4766b9b909594ec924a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQJ8BAEBCABmBQJUAb6OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOKcwQALKaKTUdtYOfHp6NT5YWXTZY -JbIkXAvBVXjg+1KNG5vfBmiBFJzKS8UOMboryqJ0dfReyf2FWCjr6bBenZMzB/VL -dJ6+9udzBY5REnygOG2hLgC53HvMTBmxo6NFSlx7M7LsGDsE5Y0lqyjxX92hRb2u -ljRiNoGjbPX2GhUgmDUfbMZ76jE5TmqGaS1HDWktk4SytgEAeGkUyfR2uy4wS567 -J/xpOtLtV6tnhNJIY5LpOMWPN0UOkkwYqyLuaEk04rsDhzrZUsDdlPIJfli9v04U -mC3GhpbyClRr4V9LW1T8zUNwGEZGRDTEGKsYM1P5z5S3W8yH5PlHsWMtm4qzsWLr -HdgvJq+iiZ8esJUmfRPcnr6HjbegllLFnujGlsvQCKhT2m70OxxLFBWaUmO2/hu2 -sTPDqMSsIUH9F6SwZJTX9vXF99HrMOFIqo8bdMaFL6QPvFt2Du9OVtY6cCi6WVxe -nI+VoCZLuDTztlF8WXSZ7j3pPZbTMOYggS3/DU5IFyNqBKQzfuxPnJB55rMSDvHy -OStHHbdXs3f2H608ikfJ/o9XIpwUpDy0BTt7NrlmUEsAOKACNTOPFtVrQ57sKGpi -dRgFREaia9NQ1uF7DU4fRihMowdn1l/Llpf+U03a2KGOPVLABW115d9ak3emq9FY -bu9jm62dZj3BfZfeT8Yd -=gg9Q ------END PGP SIGNATURE----- diff --git a/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild b/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild index a5e877b958e2..7838e7451d91 100644 --- a/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild +++ b/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild,v 1.11 2014/08/30 12:07:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt/rxvt-2.7.10-r4.ebuild,v 1.12 2015/02/20 14:41:26 mrueg Exp $ -EAPI=1 +EAPI=5 inherit eutils flag-o-matic libtool toolchain-funcs -DESCRIPTION="rxvt -- nice small x11 terminal" +DESCRIPTION="A nice small x11 terminal" HOMEPAGE="http://rxvt.sourceforge.net/ http://www.giga.it.okayama-u.ac.jp/~ishihara/opensource/" SRC_URI="mirror://sourceforge/rxvt/${P}.tar.gz @@ -24,14 +24,11 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-proto/xproto" -src_unpack() { - unpack "${P}.tar.gz" - cd "${S}" - +src_prepare() { tc-export AR - epatch "${FILESDIR}"/${P}-line-scroll.patch - epatch "${FILESDIR}"/${P}-asneeded.patch + epatch "${FILESDIR}"/${P}-line-scroll.patch\ + "${FILESDIR}"/${P}-asneeded.patch use motif && epatch "${FILESDIR}"/${P}-azz4.diff if use cjk ; then epatch "${DISTDIR}"/${P}-xim-fix.patch.gz @@ -74,13 +71,11 @@ src_compile() { --enable-shared \ --enable-keepscrolling \ --with-term=${term} \ - $(use_enable xgetdefault) || die - - emake || die + $(use_enable xgetdefault) } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install cd "${S}"/doc dodoc README* *.txt BUGS FAQ -- cgit v1.2.3-65-gdbad