From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DF0B458973 for ; Sat, 16 Jan 2016 12:37:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E52A321C014; Sat, 16 Jan 2016 12:36:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73B0A21C01A for ; Sat, 16 Jan 2016 12:36:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 442DA340B07 for ; Sat, 16 Jan 2016 12:36:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DA20E82 for ; Sat, 16 Jan 2016 12:36:55 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1452947566.98c9217629c9b52ddc0eb38decc5dc68ec308de6.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-games/tiled/ X-VCS-Repository: proj/qt X-VCS-Files: dev-games/tiled/tiled-9999.ebuild X-VCS-Directories: dev-games/tiled/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 98c9217629c9b52ddc0eb38decc5dc68ec308de6 X-VCS-Branch: master Date: Sat, 16 Jan 2016 12:36:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9b91f801-1e17-4999-abdc-fb7dada0f12f X-Archives-Hash: 3122f6d6e4ab6f210b19bdcd8095af63 commit: 98c9217629c9b52ddc0eb38decc5dc68ec308de6 Author: Michael Palimaka gentoo org> AuthorDate: Sat Jan 16 12:32:46 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Jan 16 12:32:46 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=98c92176 dev-games/tiled: sync with main tree Package-Manager: portage-2.2.26 dev-games/tiled/tiled-9999.ebuild | 66 +++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/dev-games/tiled/tiled-9999.ebuild b/dev-games/tiled/tiled-9999.ebuild index 2347bf9..6efad10 100644 --- a/dev-games/tiled/tiled-9999.ebuild +++ b/dev-games/tiled/tiled-9999.ebuild @@ -1,46 +1,66 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PLOCALES="cs de en es fr he it ja lv nl pt pt_BR ru zh" -MY_P="${PN}-qt-${PV}" +PYTHON_COMPAT=( python2_7 ) +inherit fdo-mime gnome2-utils multilib python-single-r1 qmake-utils -inherit multilib l10n qt4-r2 git-2 - -DESCRIPTION="A general purpose tile map editor." +DESCRIPTION="A general purpose tile map editor" HOMEPAGE="http://www.mapeditor.org/" EGIT_REPO_URI="git://github.com/bjorn/${PN}.git" -LICENSE="BSD GPL-2" +LICENSE="BSD BSD-2 GPL-2+" SLOT="0" -KEYWORDS="" -IUSE="examples" +KEYWORDS="~amd64" +IUSE="examples python" -DEPEND="sys-libs/zlib - >=dev-qt/qtcore-4.6:4 - >=dev-qt/qtgui-4.6:4 - >=dev-qt/qtopengl-4.6:4" -RDEPEND="${DEPEND}" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -DOCS=( AUTHORS COPYING NEWS README.md ) +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + sys-libs/zlib + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 +" -src_prepare() { - rm -r src/zlib || die - sed -e "s/^LANGUAGES =.*/LANGUAGES = $(l10n_get_locales)/" \ - -i translations/translations.pro || die +pkg_setup() { + use python && python-single-r1_pkg_setup } src_configure() { - eqmake4 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" + eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)" } src_install() { - qt4-r2_src_install + emake INSTALL_ROOT="${D}" install + + dodoc AUTHORS COPYING NEWS README.md if use examples ; then - insinto /usr/share/${PN} - doins -r examples + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples fi } + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +}