From 502ea24aa3c2c12f0b71a8ad1c719c2f3ce1329e Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Tue, 25 Nov 2014 09:06:52 +0000 Subject: [PATCH] Version bump, drop old Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- dev-util/meld/ChangeLog | 8 +- dev-util/meld/Manifest | 15 ++-- .../meld/files/meld-3.12.0-c-locale.patch | 23 ------ dev-util/meld/meld-1.8.6.ebuild | 73 ------------------- ...{meld-3.12.0.ebuild => meld-3.12.2.ebuild} | 7 +- 5 files changed, 14 insertions(+), 112 deletions(-) delete mode 100644 dev-util/meld/files/meld-3.12.0-c-locale.patch delete mode 100644 dev-util/meld/meld-1.8.6.ebuild rename dev-util/meld/{meld-3.12.0.ebuild => meld-3.12.2.ebuild} (82%) diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index da4a558ff1e6..8239679bd8ae 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/meld # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.188 2014/10/25 22:33:47 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.189 2014/11/25 09:06:50 pacho Exp $ + +*meld-3.12.2 (25 Nov 2014) + + 25 Nov 2014; Pacho Ramos +meld-3.12.2.ebuild, + -files/meld-3.12.0-c-locale.patch, -meld-1.8.6.ebuild, -meld-3.12.0.ebuild: + Version bump, drop old *meld-3.12.1 (25 Oct 2014) diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index c17a04526c03..d9ca0f2f918c 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -1,21 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX meld-3.12.0-c-locale.patch 797 SHA256 baf86737655bbc162d254595356ad21687bea8bd04cb028466784b8249e39883 SHA512 3cb5a463c43b47ec51908c543ee786c28a7e27b0a9c4436943e11e78ea716a19b4e77aa67f8a681a077591ebc5e70458697e4835b47769d294a0b41a4335778b WHIRLPOOL 830eb1e17ae79faa05b7b8dfb16bd72ab9330c5779d4ca16e3d78db345334f4a2bd43f1db8df8f1216520758f0fbdbb7092ebd1ccf97a8b5cac4a1395c912d0b DIST meld-1.8.5.tar.xz 444872 SHA256 e0f1d6007117a4be95d7c399359cb2ebfa80f2b9158222d727e9a35ae4d5d44d SHA512 09b36923fedfb8f67dd120a71a1fb591efd812b8e1e451281ffee639ce02a7c8fd0d280254c5270ec547df38a30c53a309a7749fa2a63093bd3cf8f46195332b WHIRLPOOL 3ae3bafcc99a57e794d7b3d4e794d31b70257cc20800093932d8f5e9ceca3aee9bbe49a80382ef6b206bac23f20e153904c2a074a66fc69fc803354f44bdc858 -DIST meld-1.8.6.tar.xz 447196 SHA256 af96682b8f4bf3ad4221c853b1516218d62a17ff43c38f4a83e7e8ac6736e8a5 SHA512 7a1c52c6686efab1e233f1f1506b9f0a8d4c040150fefc63d09510156a17819c375c9d10090c97e4a913ce3887d118ee09e75af7de4def24dfc5a75d5ad71511 WHIRLPOOL 83cff8350ecbe518b5f4508cb8d92d6569204062be05583e2dbca342a52ad2e9c0da15dbc03cf172e93e5b892e53d58a4d2ff6db5049bd20057b19a24e87efd7 -DIST meld-3.12.0.tar.xz 460596 SHA256 6d902884e8c4ca29d16b4852d7287345bfe293367959dac342fdc117a511c53f SHA512 0000fe41fee8d0215aac4aa87c6adb2533656b05f2d5a0097536a1a76920595fc6fa48bd29fa35557b40f44410304ecf8e5c208d10eadb578455a48758d5602f WHIRLPOOL 0371ff5bf876be3a2dd3391201d8ddbe5215a67702ae7bd9dc814cb6d67ee7258f26ad68733f67d102e4a9b381a3266b0e5f7cad79be5f64d86b3624b2c15b66 DIST meld-3.12.1.tar.xz 461632 SHA256 8e09284f8d50347386a428e1a2222f2b3a704bf84b3736908082968b5b0dc7f8 SHA512 84c4cf6665de2a811da2145c544602cbbfdbe17a2084528814c9c5e95b09e055a2e2c471ed9518204d51afb5e3c3ff81af2e33d6102b53f7eb056487cdf64def WHIRLPOOL a91710de5f590dbe7017fbf756ec9fe40e2db2b94d70da032689548865570882f8339cc43e465f6f920a3c6b807c5a5a64d1de5ce6d0197873ca011eb4b2ba2d +DIST meld-3.12.2.tar.xz 461932 SHA256 0938e6e6b4de59dbf66947f67c8c5c3d3c834feb8dabae3a047154af9544a101 SHA512 90158658fb620d3471aec8d093ef11d9bba60bd3bf14023c8ae5d685ac61aba41ca9beff9fff02c4b5e256d446752bdf27e3a23b56146c74ae4a24776c30c759 WHIRLPOOL 6bb2bf575d483f7d07d462fa675b085947d7e0717efdd606d6a43bd4dc7c5db9cdb6fb1fee0cf08b3ee94a8a840f3ecb5ccf23d0b630d729a1133959a073bf68 EBUILD meld-1.8.5.ebuild 1839 SHA256 0d32d790f5b87cea4409b262339441c443afeb9a79eaa9040b359862cf77aeb9 SHA512 85d6fb5266174888b8dbcf4f8e17678bcd4bfeb65410538577ce9a3b7a526c55efad5227da4b9e232a28c52f7487c94ff8867e9ae6c4e0717bc45689a9fb4ba6 WHIRLPOOL d8b283ad0d2d3d54d96c6503ba1dc8ff0bd336ba974b1b849f463bacd08eef942628e83cb1044f3d6be5538278f2d76b4ed6cedba93aac563b2054af7c1e1fd2 -EBUILD meld-1.8.6.ebuild 1843 SHA256 cd688e11039496274aded395035acea0cc283c4f4d1c508c3101f5e6cc69cdcd SHA512 2a06ba1feb9fcf571d554310c1c6e18467a8f05203f1837684437234e8419dff54dca914986a0ebffb7aa373ed231543899383720a38e5e7dd34aebeabfd6de7 WHIRLPOOL 13e13361620548bc5f019bfa357bdcefdf252f25c61cb11551c8d31360a48f880c1a3d9740ff68fb3ae9ee4c82a836ed0a022410fb13c095422c8a4bac656af6 -EBUILD meld-3.12.0.ebuild 1098 SHA256 389e999f11fd864c6873102c0a6cfcd719ac653f74b34a39388d3bb9da9cf9cd SHA512 a2e55c47658afe9230b88b2daaef9955645c75e470b6b7f099890479d08070b9b843ce24b64998c19ca90ca59b475567ac26505ef96684d339d6cb5a3e54d60a WHIRLPOOL e6030ae3bc1a5c9975fc6d6e2b59cbcdc736d832b48f5083afd5e1b7a9937d53952abd2407411ebcf5eb374cd3bac361fb005e64322f3a793d78d39493a87898 EBUILD meld-3.12.1.ebuild 1011 SHA256 0ab20001934a0f74cb87d20dce496d3d882c1e5ff58d3ef494d4cd6ca0d6c971 SHA512 7f11406df269e418faa118b4374a953a896a61895512dddc225608994c3f185b5bf709e035b4cca85b80cea00c12837b369f293fb2849244507f20562a5e4407 WHIRLPOOL 33238367964f3844e10af31a4f1d69137010805dab005b5683004f8f4b0836ebf28765096ab6e51f96fe160a564b15b1b283e1122d13b19330e4759faeec21b7 -MISC ChangeLog 24083 SHA256 6252c0d363091c4a540bae5c44ac9937483d092768ae9763355d873ec0a79a5b SHA512 53ce4ecfce40c41515d2fbf0ca76825c83e551a029cd6bef6ed2eb9815aab35e97b2905ca7f9241228d0b3c43a0520472ed6e62fcf04d0e6087941ee5dfcd7d8 WHIRLPOOL 8219e8d060272f599328e018deeb8a621418dc60aa9c45a82abfcc32aaba71241ba808ff46af349678528db55d3dd78b72d14cdcb270209cf3f146a5f94f364d +EBUILD meld-3.12.2.ebuild 1013 SHA256 2466dd0269a8b962f65243a428ebff9fcbac90e77a0bb3ce02d1e5b7808f4d89 SHA512 58be147cd1e11b9617354d007421d859450cb85cbf49d520812b0f55c5bc7db63209e17982aa31e5dfb329ad5573f604bd16d85c7935c217f875d45cec710b43 WHIRLPOOL 91269ee6e26821a0bde2a3ca72adf072ec7f66bc89f92b391e48a61dff148e136f37f7b72c9f08c3e93661e79da05797454ad84ae35133682e5cb9e6e6485a7d +MISC ChangeLog 24284 SHA256 f7279472c6fe9d93d8e5fd64bdbc5c5f2b818a22453e0a5037222badb0516a78 SHA512 a8d988f67ba72e94d0c719ccc35b7f2eda041200923f468860584d63b5e0887db47635ffdad6b774f204a12d9c41873f0a5e6a9343e125fb7e49424ab87c0a61 WHIRLPOOL 1d3f9c6eb16efd646af04e8617faae9b17c3742c6d163b2866e3acf4a00f89e6ded51d23581c0e2da43f62e33515f14a24d5b23c7e7bf42d9dde7633e80b1668 MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlRMJUwACgkQ1fmVwcYIWAbJjwCg49HmkuLsipb0AkSwJii0J3PG -2EEAn1cNMaep6c+lC17no3MC0e0yTNqe -=y1dH +iEYEAREIAAYFAlR0RqwACgkQCaWpQKGI+9SvVQCfbRpWRNtusXsZIC5gpZXbleH1 +eI0AnRcisgELDEpr2/EmQvmVZ44MdEcL +=0AzF -----END PGP SIGNATURE----- diff --git a/dev-util/meld/files/meld-3.12.0-c-locale.patch b/dev-util/meld/files/meld-3.12.0-c-locale.patch deleted file mode 100644 index eee7b9695649..000000000000 --- a/dev-util/meld/files/meld-3.12.0-c-locale.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c361e4eaccfaed4f5c5d64a206ea7941e3ef8a57 Mon Sep 17 00:00:00 2001 -From: Kai Willadsen -Date: Sat, 4 Oct 2014 10:01:05 +1000 -Subject: build_helpers: Make sure that we build help for C locale (bgo#737833) - - -diff --git a/meld/build_helpers.py b/meld/build_helpers.py -index 385e3dc..69ad5bf 100644 ---- a/meld/build_helpers.py -+++ b/meld/build_helpers.py -@@ -117,6 +117,9 @@ class build_help(distutils.cmd.Command): - else: - self.selected_languages = os.listdir(self.help_dir) - -+ if 'C' not in self.selected_languages: -+ self.selected_languages.append('C') -+ - self.C_PAGES = glob.glob(os.path.join(self.help_dir, 'C', '*.page')) - self.C_EXTRA = glob.glob(os.path.join(self.help_dir, 'C', '*.xml')) - --- -cgit v0.10.1 - diff --git a/dev-util/meld/meld-1.8.6.ebuild b/dev-util/meld/meld-1.8.6.ebuild deleted file mode 100644 index 41b58f94fe86..000000000000 --- a/dev-util/meld/meld-1.8.6.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.6.ebuild,v 1.1 2014/09/04 12:06:31 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" -PYTHON_COMPAT=( python2_{6,7} ) - -inherit eutils python-single-r1 gnome2 - -DESCRIPTION="A graphical diff and merge tool" -HOMEPAGE="http://meldmerge.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" - -IUSE="+highlight gnome" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}] - >=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - highlight? ( >=dev-python/pygtksourceview-2.10[${PYTHON_USEDEP}] ) - gnome? ( >=dev-python/gconf-python-2.22:2[${PYTHON_USEDEP}] ) -" -DEPEND="${RDEPEND} - app-text/scrollkeeper - dev-util/gtk-doc-am - dev-util/intltool -" - -src_prepare() { - # fix the prefix so its not in */local/* - sed -e "s:/usr/local:${EPREFIX}/usr:" \ - -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" \ - -i INSTALL || die "sed 1 failed" - - # don't install anything to /usr/share/doc/meld - sed -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" \ - -i INSTALL || die "sed 2 failed" - - # don't run scrollkeeper (with the wrong path), - # leave that to gnome2.eclass #145833 - sed -e '/scrollkeeper-update/s/\t/&#/' \ - -i help/*/Makefile || die "sed 4 failed" - - strip-linguas -i "${S}/po" - local mylinguas="" - for x in ${LINGUAS}; do - mylinguas="${mylinguas} ${x}.po" - done - - if [ -n "${mylinguas}" ]; then - sed -e "s/PO:=.*/PO:=${mylinguas}/" \ - -i po/Makefile || die "sed 6 failed" - fi - - gnome2_src_prepare -} - -src_configure() { - : -} - -src_install() { - gnome2_src_install - python_fix_shebang "${ED}"/usr/bin - doman meld.1 -} diff --git a/dev-util/meld/meld-3.12.0.ebuild b/dev-util/meld/meld-3.12.2.ebuild similarity index 82% rename from dev-util/meld/meld-3.12.0.ebuild rename to dev-util/meld/meld-3.12.2.ebuild index 9bcd868c4495..e90abe830cd9 100644 --- a/dev-util/meld/meld-3.12.0.ebuild +++ b/dev-util/meld/meld-3.12.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.0.ebuild,v 1.2 2014/10/05 10:25:09 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.2.ebuild,v 1.1 2014/11/25 09:06:50 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -34,11 +34,6 @@ DEPEND="${RDEPEND} dev-util/itstool " -PATCHES=( - # Build with C locale (from 'master') - "${FILESDIR}"/${P}-c-locale.patch -) - python_compile_all() { mydistutilsargs=( --no-update-icon-cache --no-compile-schemas ) } -- 2.26.2