From 0b2d578ad20a2eb8f383b304da4ed3708e309e35 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Sat, 27 Feb 2010 15:47:37 +0000 Subject: [PATCH] Rev bump to 0.6.1-r1, fixes bug 307037. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- app-portage/porthole/ChangeLog | 8 +++++++- app-portage/porthole/Manifest | 11 ++++++----- .../files/porthole-0.6.1-masking_status.patch | 17 +++++++++++++++++ ...le-0.6.1.ebuild => porthole-0.6.1-r1.ebuild} | 8 ++++++-- 4 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 app-portage/porthole/files/porthole-0.6.1-masking_status.patch rename app-portage/porthole/{porthole-0.6.1.ebuild => porthole-0.6.1-r1.ebuild} (91%) diff --git a/app-portage/porthole/ChangeLog b/app-portage/porthole/ChangeLog index 61785d4cbc4c..a63fe2016b90 100644 --- a/app-portage/porthole/ChangeLog +++ b/app-portage/porthole/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-portage/porthole # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/ChangeLog,v 1.42 2010/02/26 18:31:57 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/ChangeLog,v 1.43 2010/02/27 15:47:34 idl0r Exp $ + +*porthole-0.6.1-r1 (27 Feb 2010) + + 27 Feb 2010; Christian Ruppert -porthole-0.6.1.ebuild, + +porthole-0.6.1-r1.ebuild, +files/porthole-0.6.1-masking_status.patch: + Rev bump to 0.6.1-r1, fixes bug 307037. *porthole-0.6.1 (26 Feb 2010) diff --git a/app-portage/porthole/Manifest b/app-portage/porthole/Manifest index 1409c9fcecd4..6e17dbfebd16 100644 --- a/app-portage/porthole/Manifest +++ b/app-portage/porthole/Manifest @@ -1,16 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX porthole-0.6.1-masking_status.patch 485 RMD160 33844ab398f4b7b9d1f9a44bde16cbebd748f364 SHA1 6324045a2dea9532c2bd7f2567c7767999560d58 SHA256 1ba67b57505994566942f03722b6edccd817550a2fac984fbbcb25bf6c98b254 DIST porthole-0.6.0.tar.bz2 918432 RMD160 6b8d43308f3c3a7815713dc3423b9c1db2761978 SHA1 6ad75058ce4b20dca3683e9793115c570080b407 SHA256 1cb8cccbef6c2860474de53fe3d4ac65ee1b688722971b97830ef42cd76e2bd5 DIST porthole-0.6.1.tar.bz2 958696 RMD160 7265f695d02e2eec22954d827dcb7ae86712cd26 SHA1 d0d48b007152f1cc6922a8c6be4c793cdeb45d61 SHA256 eb9991cb078f51f5b4c9900995ffc3f7f5e3891e62b10cd1c5384efece010d62 EBUILD porthole-0.6.0.ebuild 1706 RMD160 ad0564c40ee5887732950843b2648298410976e0 SHA1 f18abdb98494cd51c4b90d96de8b5451e3148ccb SHA256 02c3b4058494e6baddc97d874e0bab6cc580e1dfd51700ae52b723e9cb1eb7b9 -EBUILD porthole-0.6.1.ebuild 1899 RMD160 04d07781240751f5f9fb3fee15c8fef5608ee1dd SHA1 9b0780865b3027402ae03234085a75e397111de2 SHA256 ec69be36747615ab68682b9ae54d4f079f68933e9417c1bce418943c9419c8b5 -MISC ChangeLog 6124 RMD160 c6090827891f69e40b164f79e12a2ee2d910bd34 SHA1 2d1b9cf80ff5af03f80078277e1df12ecaa9d431 SHA256 22c48ff54305108c93a1fa8069cffb4503606c210226eaed5a669149e07d55ba +EBUILD porthole-0.6.1-r1.ebuild 1989 RMD160 6b20e75159b1650804e1a3fad659245d061b56b7 SHA1 4910a893a5b45894931d879bb0145c426564eaa2 SHA256 226c4ecc154a0556af0d5a974503587c6053d811d491dd2165f7a06d2617b3e0 +MISC ChangeLog 6350 RMD160 60a4ff3f788f0fe0ac881d5d28f77511ba60cffb SHA1 44de7aedfdba5f01d316506c0581547498d35383 SHA256 a9b4ab0a0b0f3bd3b9b9b8675964c3b15d01dc65824c4808287e7cfc1a342941 MISC metadata.xml 333 RMD160 81d8b5027bf8d349bac5089a7db92525b731cf1a SHA1 71116e25d8a005d380bddcf32e106a3f462f58e3 SHA256 a983bc5809b1b8fd545114c3d938e894b139835b5e9cc04bea6880d1538e66ca -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuIE6cACgkQixe2jn+ufTgWXgCfUtNwclryCWR9Nx3XIDlbk6Oz -Kp0An2fc/hka5npdNHQ0hKn/KRZ4deki -=K2ah +iEYEARECAAYFAkuJPqEACgkQixe2jn+ufTivpwCfRv1JFyr2e1d9mleVvw4cylue +eTQAn0W9YIWZnk9zWgD2E2Ne1VJ868ka +=EV+C -----END PGP SIGNATURE----- diff --git a/app-portage/porthole/files/porthole-0.6.1-masking_status.patch b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch new file mode 100644 index 000000000000..e626fbb3c58f --- /dev/null +++ b/app-portage/porthole/files/porthole-0.6.1-masking_status.patch @@ -0,0 +1,17 @@ +Index: porthole/backends/portagelib.py +=================================================================== +--- porthole/backends/portagelib.py (revision 1209) ++++ porthole/backends/portagelib.py (working copy) +@@ -452,7 +452,11 @@ + + + def get_masking_status(ebuild): +- return portage.getmaskingstatus(ebuild) ++ try: ++ status = portage.getmaskingstatus(ebuild) ++ except KeyError: ++ status = ['deprecated'] ++ return status + + + def get_masking_reason(ebuild): diff --git a/app-portage/porthole/porthole-0.6.1.ebuild b/app-portage/porthole/porthole-0.6.1-r1.ebuild similarity index 91% rename from app-portage/porthole/porthole-0.6.1.ebuild rename to app-portage/porthole/porthole-0.6.1-r1.ebuild index 44c1b3ee8ea7..c3b9e60ace0c 100644 --- a/app-portage/porthole/porthole-0.6.1.ebuild +++ b/app-portage/porthole/porthole-0.6.1-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.1.ebuild,v 1.1 2010/02/26 18:31:57 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.1-r1.ebuild,v 1.1 2010/02/27 15:47:34 idl0r Exp $ EAPI="2" -inherit distutils +inherit distutils eutils DESCRIPTION="A GTK+-based frontend to Portage" HOMEPAGE="http://porthole.sourceforge.net" @@ -26,6 +26,10 @@ RDEPEND=">=dev-lang/python-2.4[xml,threads] DEPEND="${RDEPEND} nls? ( >=sys-devel/gettext-0.14 )" +src_prepare() { + epatch "${FILESDIR}/${P}-masking_status.patch" # bug 307037 +} + src_compile(){ # Compile localizations if necessary if use nls ; then -- 2.26.2