diff options
author | 2013-09-28 09:35:51 +0000 | |
---|---|---|
committer | 2013-09-28 09:35:51 +0000 | |
commit | b3305b0316fb07e0b91129a7209ef26eb1af01e9 (patch) | |
tree | 351c48bb86f936d8d33be747e5a875c36c0beaaa /app-admin | |
parent | Drop to ~ppc, wrt bug #486254 (diff) | |
download | historical-b3305b0316fb07e0b91129a7209ef26eb1af01e9.tar.gz historical-b3305b0316fb07e0b91129a7209ef26eb1af01e9.tar.bz2 historical-b3305b0316fb07e0b91129a7209ef26eb1af01e9.zip |
Add epatch_user. This fixes bug #478482.
Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D
Diffstat (limited to 'app-admin')
-rw-r--r-- | app-admin/conky/ChangeLog | 5 | ||||
-rw-r--r-- | app-admin/conky/Manifest | 10 | ||||
-rw-r--r-- | app-admin/conky/conky-1.9.0-r2.ebuild | 8 |
3 files changed, 15 insertions, 8 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index ce84147a01c9..3e58e5f85b83 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/conky # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.210 2013/08/04 19:51:43 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.211 2013/09/28 09:35:46 billie Exp $ + + 28 Sep 2013; Daniel Pielmeier <billie@gentoo.org> conky-1.9.0-r2.ebuild: + Add epatch_user. This fixes bug #478482. 04 Aug 2013; Markus Meier <maekke@gentoo.org> conky-1.9.0-r2.ebuild: add ~arm, bug #474026 diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index c05dfe1f13c4..61ee20967f9a 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -6,13 +6,13 @@ AUX conky-1.9.0-lines-fix.patch 1067 SHA256 9a406f382092632e458d368b5fff81217258 AUX conky-1.9.0-ncurses.patch 939 SHA256 76a777bab29009c2053b61e9e5904aea131c93d5f026acc161048374f75e72f6 SHA512 0a0737bec67eb241dee4029907d9f3e5bc8d49c8239fbdda5cbfa2b7b0aa50fb2ac9bf3397ccecd94768a176fc6c3ec0e18d67391d9285aff9658ba234202d4e WHIRLPOOL 0893db6ffbc2b37c58b2de8e34e4288640a1d3a5e3a754bd39faec141a7e94e49c83011f5eb58c86afe838fff1b77a661ff63a61f6780f9ca5e5b24f50463014 AUX conky-1.9.0-update-when-message-count-decreases.patch 2723 SHA256 d47df08331ff381eacfb9729f76135f7e556b51a4d8e2005df789f604b2fed38 SHA512 f4867a37d3874a3b6248d33c176f2178fa1171a16c61789895c4c10419ce28bc766d712ebba9ca7eade2c352331f43466e440f3c787ab879e66d4a60177b6264 WHIRLPOOL ab4fc736098bd6577e75a3670bfd0d39ad9a453fe3fce41716e4c6ed9d6f56f9b22ab2d0589253d9aad4dfe158c1c465588876e15a820c02d9cfdca9a11e68d9 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a -EBUILD conky-1.9.0-r2.ebuild 3872 SHA256 3183230e15d36fda3d4d98d59a92125348ff5d7446af80a07a989dc8accf9e88 SHA512 93ee3419e611ee8d4356a8a5348a01c5f1544d48d81a170bd22318cf18fcfed5bb94df41aa32fd8af32e0a06682a83809a19603668f96e234899eeb6b05f1a17 WHIRLPOOL aa45cd38dcf3724e899f87cc4210e1bd2a97682a46480a73964d58fa813941b2f6753f4e239f07f6129ce24d7cc5dca999734b3251f861a2520d2e4f1ded3ab0 -MISC ChangeLog 31838 SHA256 8cd0a7074a97da8eecde082b2992f377376b9acb42350597bab7d88d99bcff24 SHA512 2521c2c270cf2e3c61772e3251ba04688e4ba43b4600e27e4c92848783db69ed7f104e6855a9b1a746a6bcd7030cb229900d4b81a09582c78c942a8d5b7bfa7f WHIRLPOOL 271633d3237f4df84a953d191e2811ac3a2fe38eb257362c43e55a7618834dc59323b51e17cb5c47bea5016fcc37287b729acd57267bd9ac98e57410c1224d0a +EBUILD conky-1.9.0-r2.ebuild 4013 SHA256 ca93f00b03e1ac7d9dd803a9c4d3091b12f8f1c5f5acb34fdf450d8c1cad38e4 SHA512 8e9f71f39e6a56b4ab161a2361481fc9133ab701dd4205cc068aa959499866afd8f476343c84a0c1b5931f9aeca7ef8c96fd18c9c7c229b85c06a0ea0a44b3eb WHIRLPOOL 4dbb2bc47543c1cc5a77f4f1ba336df38d87c13eaa940209e98a2c093b1e21f915bdb46673f5ba81eca8e58cfd5597a8a41544c0e0a29bdb2fec8dd7311133a8 +MISC ChangeLog 31957 SHA256 cc3fc439dba034e51da1d046964d6e73c02bcd3c0c2f679e9068f7e45fd8a224 SHA512 b01131533a551539c2e19d6f690b117e93de7b92e469c6cafb3fcdbb1c8d9615d477b0f9a6b40a2557b7e71b8190c2ff16d3d84aa62c525ed7ab809c476c6863 WHIRLPOOL 58b8881e6750ce0b03388da37a9a1e92c520df197e1c6979663ad5340c7395ea15250c03a8e86c0628b5ba3c927fe1da7feaa4f650b6251e873c9867204e1c8f MISC metadata.xml 2065 SHA256 697fdf5628f91d6a489add4bb77b4cf926ac72feb3cf09de0f733e842e7d2a67 SHA512 33ec0b8e3e9098671f2e733115a1e97931757ecb7932814de2e4ba7dfd4e45b15e2eda48a10d0ed97becb27bd45d40ed09f3deb70a09314e3167d665f90bf9ae WHIRLPOOL 58ac38f69259e8d4ea3e41c3f1221537cdabc20e144048065198b1c8044ffd85ad5398346007aad1c46747a6073023a40e04eeebd37cdb006d84d959cc3e246d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREIAAYFAlH+sj4ACgkQkKaRLQcq0GL85gCfbobEhO/ROCJG8fmyr0delUdi -7ucAoJv7Dsf5SXcEuPjwu0XZU0up+Rga -=+PKC +iEYEAREIAAYFAlJGovcACgkQlcuUeyFa0U3orwCg1lZMmK7pYl6AGB/Kxr9DA55b +ofUAnjTDaMSfOu+x7iwKFxBY/zCJmInP +=aJ7v -----END PGP SIGNATURE----- diff --git a/app-admin/conky/conky-1.9.0-r2.ebuild b/app-admin/conky/conky-1.9.0-r2.ebuild index e9310966640c..710f3802d26d 100644 --- a/app-admin/conky/conky-1.9.0-r2.ebuild +++ b/app-admin/conky/conky-1.9.0-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r2.ebuild,v 1.9 2013/08/04 19:51:43 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.9.0-r2.ebuild,v 1.10 2013/09/28 09:35:46 billie Exp $ EAPI=5 -inherit eutils +inherit autotools eutils libtool DESCRIPTION="An advanced, highly configurable system monitor for X" HOMEPAGE="http://conky.sourceforge.net/" @@ -63,6 +63,10 @@ src_prepare() { "${FILESDIR}/${P}-ncurses.patch" \ "${FILESDIR}/${P}-lines-fix.patch" \ "${FILESDIR}/${P}-update-when-message-count-decreases.patch" + + # Allow user patches #478482 + # Only run autotools if user patched something + epatch_user && eautoreconf || elibtoolize } src_configure() { |