diff options
author | 2010-11-23 16:12:05 +0000 | |
---|---|---|
committer | 2010-11-23 16:12:05 +0000 | |
commit | 3fa38af417b81a5b00e4030bb47bc631c5787ffb (patch) | |
tree | 5f4b631789ee02e17e786e8292b040bd5ad706b1 /dev-util/meld | |
parent | Remove development version of net-ftp/lftp. (diff) | |
download | historical-3fa38af417b81a5b00e4030bb47bc631c5787ffb.tar.gz historical-3fa38af417b81a5b00e4030bb47bc631c5787ffb.tar.bz2 historical-3fa38af417b81a5b00e4030bb47bc631c5787ffb.zip |
Clean up old revisions.
Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64
Diffstat (limited to 'dev-util/meld')
-rw-r--r-- | dev-util/meld/ChangeLog | 6 | ||||
-rw-r--r-- | dev-util/meld/Manifest | 14 | ||||
-rw-r--r-- | dev-util/meld/meld-1.3.0.ebuild | 73 | ||||
-rw-r--r-- | dev-util/meld/meld-1.3.2.ebuild | 80 | ||||
-rw-r--r-- | dev-util/meld/meld-1.3.3.ebuild | 80 |
5 files changed, 9 insertions, 244 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 5c153e16bcf6..6e8f07fcbfbf 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/meld # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.114 2010/10/17 20:18:57 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.115 2010/11/23 16:12:05 eva Exp $ + + 23 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org> -meld-1.3.0.ebuild, + -meld-1.3.2.ebuild, -meld-1.3.3.ebuild: + Clean up old revisions. 17 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> meld-1.4.0.ebuild: Fix python eclass usage, per Arfrever comments, bug #326101. diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index 3bdacc83f5f7..148157fd6dfb 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -1,22 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST meld-1.3.0.tar.bz2 799554 RMD160 d001f2a74fe25f2bf6539bc29e9d9be8b5f4a94b SHA1 a8b53d3f3e4ff1ededfef4ce500c2d664cb3af75 SHA256 94a6f834ce236fc1efb026fb9a875c8cb51d2c4f82361b0c989bef38ae015bfc DIST meld-1.3.1.tar.bz2 795145 RMD160 bf9bace33ddf1d3b6b99e358799316791390cec0 SHA1 d3ab96a364b73afdfd9f26cc9bec18321f04c9df SHA256 d60e735869bb64cc7007466eea3ad639e22eb223c6d5379508ffd0b4f0901647 -DIST meld-1.3.2.tar.bz2 741154 RMD160 7ff1bbbb46448366693f9095c7687fde7b952bd2 SHA1 1cb5174385365127d5b2e02343c73fc01c8a89ef SHA256 c2868f902c4e6eaa3a02c623fbe1c9277a64aad133030ef7fda1e34baff32fc9 -DIST meld-1.3.3.tar.bz2 333460 RMD160 2041864c14be2fc2c10f82ac300da80c9a51272c SHA1 2f0555a69430e4ab4bd9c0b69beb0658daa2132f SHA256 bfdf9a5e33a7ebc5b976fbd2925033e2bbd46e8f632437959b88aac35676d08a DIST meld-1.4.0.tar.bz2 333793 RMD160 5e244b450cd1a11b8eeb8176a77043a0a6eff63a SHA1 2db6d610f1d1e2ef2bd0e0027695e72f6f6a6ac9 SHA256 0edb78d9da2bfe7e630742111eb6d8edc476c8cc91b1f6403d940d072dd75469 -EBUILD meld-1.3.0.ebuild 1852 RMD160 8d28d2e8bfd76f4a27d788ca5f660bdc1a421eaa SHA1 19d14f440d1835890ede7d5d88f031d36f15b1c8 SHA256 6da17b08d0a341012c4515fecf670d2770665c08424105260486176b97c15f42 EBUILD meld-1.3.1.ebuild 1874 RMD160 7ee313ceca2f9ffd4dfc772a70adc9657bd7dad6 SHA1 70d7204d2906ee698d821f235ed6aff047e593e0 SHA256 9764fbe9bbf6c1457409d246371119070e6b011f86294f02571c8050ee263d56 -EBUILD meld-1.3.2.ebuild 2044 RMD160 657d3857938b8f04f309e25b80bebcea003e6bfb SHA1 09a8879daa9c23c896712a4ccf9c8bb5d95d27ae SHA256 51b7815794b423ec17e21779dae411fbeb241195ac0a392e505102681486e617 -EBUILD meld-1.3.3.ebuild 2038 RMD160 6fdb490c7572f2069b11d7b39d19f08febb80fc5 SHA1 8856d59afa9ea52594ccba282c4b1f6a1eca93de SHA256 019e1aa6a8f79b4c4bd9b354526a7badda2a3cbada2f74f1e3cfa953d3a96076 EBUILD meld-1.4.0.ebuild 2485 RMD160 f331d6dcb85a5ad5784c70ebac5c48d7d4e0f674 SHA1 22d65a6d201b27f20312bf75a42d845cc05605a5 SHA256 813eb00c38b01594ef036a0f62464a9060faebe6d3ede8e95fff4768f052b880 -MISC ChangeLog 15211 RMD160 ab6c28191b525cde1c4f17beee278ea62454a5e6 SHA1 9d2bdb3a2ea7c7eea01e84caf0fee17c26a1f87e SHA256 c2ae93540d79542094bf94d33501cdd7a6daafd6b414216b32eb41196391b984 +MISC ChangeLog 15354 RMD160 199eb2e75845f6cae1ca8d4b4caa46acc1ec1657 SHA1 e360261d5c279b15dd24ea9c8f71acb8d7a50f85 SHA256 c5894781ded32945d26ee885d534b56f89d3924cffb763557a62984717071ab2 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAky7WkMACgkQ1fmVwcYIWAY7SACcDAOTuJUueeTx6ZH/0RFefDRg -lTgAn2tGxLswjeRdxIqwDJ8CM5eRzDjQ -=CBoQ +iEYEARECAAYFAkzr5+gACgkQ1fmVwcYIWAbPAgCgz8zedIAWJeUm6do8DemnaojC +mmgAnRb9ElZvgOW5ZBDxwQTIDQu0Hs34 +=+yY/ -----END PGP SIGNATURE----- diff --git a/dev-util/meld/meld-1.3.0.ebuild b/dev-util/meld/meld-1.3.0.ebuild deleted file mode 100644 index 78b3c5c1d272..000000000000 --- a/dev-util/meld/meld-1.3.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.3.0.ebuild,v 1.7 2009/07/19 13:02:10 nixnut Exp $ - -inherit python gnome2 eutils multilib - -DESCRIPTION="A graphical (GNOME 2) diff and merge tool" -HOMEPAGE="http://meld.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" -IUSE="doc gnome" - -RDEPEND=">=dev-lang/python-2.4 - >=gnome-base/libglade-2 - gnome? ( - >=gnome-base/libgnome-2 - >=dev-python/libgnome-python-2.22 - >=dev-python/gconf-python-2.22 - >=dev-python/gnome-vfs-python-2.22 ) - >=dev-python/pygtk-2.8.0 - >=dev-python/pygobject-2.8" - -DEPEND="${RDEPEND} - dev-util/intltool - app-text/scrollkeeper" - -DOCS="AUTHORS changelog help/" - -src_unpack() { - gnome2_src_unpack - - # fix the prefix so its not in */local/* - sed -e 's:/usr/local:/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" - - # let the python eclass handle python objects - sed -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' \ - -i GNUmakefile || die "sed 3 failed" - - # don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833 - sed -e '/scrollkeeper-update/s/\t/&#/' \ - -i help/*/GNUmakefile || 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/GNUmakefile || die "sed 5 failed" - fi -} - -src_compile() { - emake || die "make failed" -} - -pkg_postinst() { - python_mod_optimize /usr/$(get_libdir)/meld -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/meld -} diff --git a/dev-util/meld/meld-1.3.2.ebuild b/dev-util/meld/meld-1.3.2.ebuild deleted file mode 100644 index 1db112c74bf1..000000000000 --- a/dev-util/meld/meld-1.3.2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.3.2.ebuild,v 1.2 2010/08/30 06:56:36 mr_bones_ Exp $ - -GCONF_DEBUG="no" - -inherit python gnome2 eutils multilib - -DESCRIPTION="A graphical (GNOME 2) diff and merge tool" -HOMEPAGE="http://meld.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc gnome" - -RDEPEND=">=dev-lang/python-2.4 - >=gnome-base/libglade-2 - gnome? ( - >=gnome-base/libgnome-2 - >=dev-python/libgnome-python-2.22 - >=dev-python/gconf-python-2.22 - >=dev-python/gnome-vfs-python-2.22 ) - >=dev-python/pygtk-2.8 - >=dev-python/pygobject-2.8" - -DEPEND="${RDEPEND} - dev-util/intltool - app-text/scrollkeeper" - -DOCS="AUTHORS NEWS help/ChangeLog" - -src_unpack() { - gnome2_src_unpack - - # fix the prefix so its not in */local/* - sed -e 's:/usr/local:/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" - - # let the python eclass handle python objects - sed -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' \ - -i Makefile || die "sed 3 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" - - # fix test suite - sed -e 's,\(for file in \["\)\(meld"\]\),\1bin/\2,' \ - -e 's,\(open("\)\(meldapp.py")\),\1meld/\2,' \ - -i tools/check_release || die "sed 5 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 5 failed" - fi -} - -src_compile() { - emake || die "make failed" -} - -pkg_postinst() { - python_mod_optimize /usr/$(get_libdir)/meld -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/meld -} diff --git a/dev-util/meld/meld-1.3.3.ebuild b/dev-util/meld/meld-1.3.3.ebuild deleted file mode 100644 index 39b8e05f8b0f..000000000000 --- a/dev-util/meld/meld-1.3.3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.3.3.ebuild,v 1.1 2010/09/13 20:58:17 eva Exp $ - -GCONF_DEBUG="no" - -inherit python gnome2 eutils multilib - -DESCRIPTION="A graphical (GNOME 2) diff and merge tool" -HOMEPAGE="http://meld.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc gnome" - -RDEPEND=">=dev-lang/python-2.4 - >=gnome-base/libglade-2 - gnome? ( - >=gnome-base/libgnome-2 - >=dev-python/libgnome-python-2.22 - >=dev-python/gconf-python-2.22 - >=dev-python/gnome-vfs-python-2.22 ) - >=dev-python/pygtk-2.8 - >=dev-python/pygobject-2.8" - -DEPEND="${RDEPEND} - dev-util/intltool - app-text/scrollkeeper" - -DOCS="AUTHORS NEWS help/ChangeLog" - -src_unpack() { - gnome2_src_unpack - - # fix the prefix so its not in */local/* - sed -e 's:/usr/local:/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" - - # let the python eclass handle python objects - sed -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' \ - -i Makefile || die "sed 3 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" - - # fix test suite - sed -e 's,\(for file in \["\)\(meld"\]\),\1bin/\2,' \ - -e 's,\(open("\)\(meldapp.py")\),\1meld/\2,' \ - -i tools/check_release || die "sed 5 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 5 failed" - fi -} - -src_compile() { - emake || die "make failed" -} - -pkg_postinst() { - python_mod_optimize /usr/$(get_libdir)/meld -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/meld -} |