From 50436bd81b0e8ed76a388ba645bf497c4e5af063 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Wed, 10 Jan 2007 09:38:51 +0000 Subject: [PATCH] Removed check for dev-python/pygtk gnome USE-flag. Package-Manager: portage-2.1.2_rc4-r1 --- dev-util/meld/ChangeLog | 6 +++++- dev-util/meld/Manifest | 34 ++++++++++++--------------------- dev-util/meld/meld-1.1.3.ebuild | 18 +++-------------- dev-util/meld/meld-1.1.4.ebuild | 16 ++-------------- 4 files changed, 22 insertions(+), 52 deletions(-) diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 65ef1fc33a1e..2a7b1c38eb97 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/meld # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.47 2007/01/10 01:28:06 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.48 2007/01/10 09:38:51 dev-zero Exp $ + + 10 Jan 2007; Tiziano Müller meld-1.1.3.ebuild, + meld-1.1.4.ebuild: + Removed check for dev-python/pygtk gnome USE-flag. 10 Jan 2007; Gustavo Zacarias meld-1.1.4.ebuild: Stable on sparc wrt #152878 diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index d0d4a15fa36e..c8c342d71d6e 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -1,24 +1,21 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX fix-po.patch 4005 RMD160 1f34be3c97b5af335a46781be36bba6fb951b531 SHA1 d2c84e9db6971f8cd23787e0dda53f09c8f17e56 SHA256 6977f8fb96fbb1320e46beab7c9ddce0253b553de91c975f540a884bafd7f99b MD5 3ec863ae5648587f525dddd4cc614557 files/fix-po.patch 4005 RMD160 1f34be3c97b5af335a46781be36bba6fb951b531 files/fix-po.patch 4005 SHA256 6977f8fb96fbb1320e46beab7c9ddce0253b553de91c975f540a884bafd7f99b files/fix-po.patch 4005 DIST meld-1.1.3.tar.bz2 597967 RMD160 43134e32b33aa2f5a405c4ad2ba90eb22b632fbc SHA1 e7f17e8426f29aa448cfed306dccb00ac0a3e43b SHA256 0494636661aadf07520e6d75c986a53af136b6d6c4e71bdcb9dde01554dcbdb9 DIST meld-1.1.4.tar.bz2 599912 RMD160 ae327557458cae31660d3c30bcd6640f0406f1fa SHA1 52f51e5825b4e2bb56594a9f4e180908e714848f SHA256 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f -EBUILD meld-1.1.3.ebuild 1550 RMD160 1b314cb259132acec47fab6bd1e6a2443c22e91b SHA1 3afed2e3e0f58512c2451bede85129b0e4b8dac3 SHA256 ce513af076674d02387abf8616f8397c9c88381f149a4159bdb2ba6959ee33a4 -MD5 6864d95974956f1a6f38e56f4835066c meld-1.1.3.ebuild 1550 -RMD160 1b314cb259132acec47fab6bd1e6a2443c22e91b meld-1.1.3.ebuild 1550 -SHA256 ce513af076674d02387abf8616f8397c9c88381f149a4159bdb2ba6959ee33a4 meld-1.1.3.ebuild 1550 -EBUILD meld-1.1.4.ebuild 1666 RMD160 49bf8011db07ae5bf57ae1b49c6569a46f1cc379 SHA1 2e974cd1b8ecf2edf42a9cddb72dff54f7786b6a SHA256 d412696c995bda7f73e599b9cf94e2e995c4089c82f34775fbdfe94e9feb8a01 -MD5 f5c738477fbb207b6fbc07d4a14782c8 meld-1.1.4.ebuild 1666 -RMD160 49bf8011db07ae5bf57ae1b49c6569a46f1cc379 meld-1.1.4.ebuild 1666 -SHA256 d412696c995bda7f73e599b9cf94e2e995c4089c82f34775fbdfe94e9feb8a01 meld-1.1.4.ebuild 1666 -MISC ChangeLog 7033 RMD160 ceb9ca075fa4aaba50a95018f34c31f6c6ef4af8 SHA1 7767312da8130fcdd6efd6cb2262dd1f34a7574b SHA256 de2ad1451b9a5af36d5c832e11abee2bbed5a30d032bb7dd2dc739d5bb1cb950 -MD5 6960f750bfb022e235b04e1e1aa91bb2 ChangeLog 7033 -RMD160 ceb9ca075fa4aaba50a95018f34c31f6c6ef4af8 ChangeLog 7033 -SHA256 de2ad1451b9a5af36d5c832e11abee2bbed5a30d032bb7dd2dc739d5bb1cb950 ChangeLog 7033 +EBUILD meld-1.1.3.ebuild 1197 RMD160 bd4653730b5d49b23c85e5786d42f329e3f20352 SHA1 019a5c87573b1073b53614414e1d0abc74dd68b4 SHA256 126459a06fea36e205cddee4ef0ab61b36afae8baaedc3931aa381438c898d3b +MD5 9033dfac0da73cf0005b0278949afefb meld-1.1.3.ebuild 1197 +RMD160 bd4653730b5d49b23c85e5786d42f329e3f20352 meld-1.1.3.ebuild 1197 +SHA256 126459a06fea36e205cddee4ef0ab61b36afae8baaedc3931aa381438c898d3b meld-1.1.3.ebuild 1197 +EBUILD meld-1.1.4.ebuild 1312 RMD160 c110f4c2c71ff79f1d4ed75885b15bec577bc9e2 SHA1 d6607a20cc7a2595a800dca3ca190a666c56ea6d SHA256 3311762253f9dc3b13e8985813c1a90728410652d667e5f2b329b51f78540387 +MD5 e612d94ce23e7e91e530bd4f192b3786 meld-1.1.4.ebuild 1312 +RMD160 c110f4c2c71ff79f1d4ed75885b15bec577bc9e2 meld-1.1.4.ebuild 1312 +SHA256 3311762253f9dc3b13e8985813c1a90728410652d667e5f2b329b51f78540387 meld-1.1.4.ebuild 1312 +MISC ChangeLog 7180 RMD160 b2ad554dd016966816d0dc9bd0b9ce6c341e1399 SHA1 e29c3a370f62310a3a6c67946152557661d4741e SHA256 819a8e4e209f4e33ee14e6980698237b954438833c3be39626e37a080bbf9ccc +MD5 34388409f8d5071f8596083a30954bb7 ChangeLog 7180 +RMD160 b2ad554dd016966816d0dc9bd0b9ce6c341e1399 ChangeLog 7180 +SHA256 819a8e4e209f4e33ee14e6980698237b954438833c3be39626e37a080bbf9ccc ChangeLog 7180 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -29,10 +26,3 @@ SHA256 59fc6d05cf97b39dca34fdfc4161642aa1bad60c3f811bb668064191c8e2ebdb files/di MD5 366840d5e7f0bca6e5e1d56724dd6757 files/digest-meld-1.1.4 235 RMD160 b7f6be12a22bf89fc13e6896ef35887ab184b86a files/digest-meld-1.1.4 235 SHA256 0dc9c9acd57e433dd314f227d209444c7cd750c56d9a77ced153cbcadec5671f files/digest-meld-1.1.4 235 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) - -iD8DBQFFpEFSKRy60XGEcJIRAj8mAJ9VuxF1cJY9L5b3eX/SwMY1G6aCdwCfW7CG -R/9kJaIx1IaYdKvIXiJc0IM= -=eOy8 ------END PGP SIGNATURE----- diff --git a/dev-util/meld/meld-1.1.3.ebuild b/dev-util/meld/meld-1.1.3.ebuild index 4e6c0e782527..75cf5c8d5722 100644 --- a/dev-util/meld/meld-1.1.3.ebuild +++ b/dev-util/meld/meld-1.1.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.3.ebuild,v 1.9 2006/09/11 16:59:53 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.3.ebuild,v 1.10 2007/01/10 09:38:51 dev-zero Exp $ inherit python gnome2 eutils @@ -20,19 +20,7 @@ DEPEND=">=dev-lang/python-2.3 >=dev-python/pyorbit-1.99.0 dev-python/gnome-python-extras" -DOCS="AUTHORS COPYING INSTALL README.CVS changelog help/" - -pkg_setup() { - if has_version "=dev-python/pygtk-2.6*"; then - if ! built_with_use "dev-python/pygtk" gnome ; then - einfo - einfo "Meld requires pygtk to be built with the gnome use flag set." - einfo "Please re-emerge pygtk with the gnome use flag set." - einfo - die "You need to re-emerge pygtk with gnome use flag." - fi - fi -} +DOCS="AUTHORS README.CVS changelog help/" src_unpack() { gnome2_src_unpack diff --git a/dev-util/meld/meld-1.1.4.ebuild b/dev-util/meld/meld-1.1.4.ebuild index 16d13f4f591f..ff07b7c59063 100644 --- a/dev-util/meld/meld-1.1.4.ebuild +++ b/dev-util/meld/meld-1.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.4.ebuild,v 1.6 2007/01/10 01:28:06 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.4.ebuild,v 1.7 2007/01/10 09:38:51 dev-zero Exp $ inherit python gnome2 eutils @@ -20,19 +20,7 @@ DEPEND=">=dev-lang/python-2.3 >=dev-python/pyorbit-1.99.0 gnome? ( dev-python/gnome-python-desktop )" -DOCS="AUTHORS COPYING INSTALL README.CVS changelog help/" - -pkg_setup() { - if has_version "=dev-python/pygtk-2.6*"; then - if ! built_with_use "dev-python/pygtk" gnome ; then - einfo - einfo "Meld requires pygtk to be built with the gnome use flag set." - einfo "Please re-emerge pygtk with the gnome use flag set." - einfo - die "You need to re-emerge pygtk with gnome use flag." - fi - fi -} +DOCS="AUTHORS README.CVS changelog help/" src_unpack() { gnome2_src_unpack -- 2.26.2