[gentoo-commits] gentoo-x86 commit in dev-util/diffuse: ChangeLog diffuse-0.4.7-r1.ebuild diffuse-0.4.7.ebuild

[gentoo-commits] gentoo-x86 commit in dev-util/diffuse: ChangeLog diffuse-0.4.7-r1.ebuild diffuse-0.4.7.ebuild

[Andrey Grozin (grozin)]

grozin      13/07/01 11:17:48

  Modified:             ChangeLog
  Added:                diffuse-0.4.7-r1.ebuild
  Removed:              diffuse-0.4.7.ebuild
  Log:
  Fixed #406433 and #475196, many thanks to Julian Ospald <hasufell@gentoo.org>
  
  (Portage version: 2.2.0_alpha185/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)

Revision  Changes    Path
1.18                 dev-util/diffuse/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/diffuse/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/diffuse/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/diffuse/ChangeLog?r1=1.17&r2=1.18

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/diffuse/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog	15 May 2013 11:15:23 -0000	1.17
+++ ChangeLog	1 Jul 2013 11:17:47 -0000	1.18
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/diffuse
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/ChangeLog,v 1.17 2013/05/15 11:15:23 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/ChangeLog,v 1.18 2013/07/01 11:17:47 grozin Exp $
+
+*diffuse-0.4.7-r1 (01 Jul 2013)
+
+  01 Jul 2013; Andrey Grozin <grozin@gentoo.org> -diffuse-0.4.7.ebuild,
+  +diffuse-0.4.7-r1.ebuild:
+  Fixed #406433 and #475196, many thanks to Julian Ospald <hasufell@gentoo.org>
 
 *diffuse-0.4.7 (15 May 2013)
 



1.1                  dev-util/diffuse/diffuse-0.4.7-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/diffuse/diffuse-0.4.7-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/diffuse/diffuse-0.4.7-r1.ebuild?rev=1.1&content-type=text/plain

Index: diffuse-0.4.7-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/diffuse/diffuse-0.4.7-r1.ebuild,v 1.1 2013/07/01 11:17:47 grozin Exp $

EAPI=5
PYTHON_COMPAT=( python2_6 python2_7 )

inherit fdo-mime python-single-r1

DESCRIPTION="A graphical tool to compare and merge text files"
HOMEPAGE="http://diffuse.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"

DEPEND="${PYTHON_DEPS}"
RDEPEND="${DEPEND}
	dev-python/pygtk[${PYTHON_USEDEP}]"
# file collision, bug #279018
DEPEND="${DEPEND}
	!sci-chemistry/tinker"

src_prepare() {
	local i p

	# linguas handling wrt #406433
	if [[ -n "${LINGUAS+x}" ]] ; then
		for i in $(for p in translations/*.po ; do echo ${p%.po} ; done) ; do
			if ! has ${i##*/} ${LINGUAS} ; then
				rm "${S}"/${i}.po || die
			fi
		done
	fi

	python_fix_shebang src/usr/bin/diffuse
}

src_install() {
	"${PYTHON}" install.py \
		--prefix=/usr \
		--files-only \
		--destdir="${D}" \
		|| die "Installation failed"
	dodoc AUTHORS ChangeLog README
}

pkg_postinst() {
	fdo-mime_desktop_database_update
}

pkg_postrm() {
	fdo-mime_desktop_database_update
}