From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-848779-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 6D5421384B4
	for <garchives@archives.gentoo.org>; Thu, 26 Nov 2015 11:46:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id E9D3721C017;
	Thu, 26 Nov 2015 11:46:05 +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 7DA4021C017
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Nov 2015 11:46:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 5A8A633BEE9
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Nov 2015 11:46:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 1274DABD
	for <gentoo-commits@lists.gentoo.org>; Thu, 26 Nov 2015 11:46:03 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1448538220.deb7b700064653a0d7617f9e726096f22d0f89a3.jlec@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: /
X-VCS-Repository: repo/gentoo
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: deb7b700064653a0d7617f9e726096f22d0f89a3
X-VCS-Branch: master
Date: Thu, 26 Nov 2015 11:46:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: c06f38bc-4e6c-4504-979b-ac92fb14cef0
X-Archives-Hash: 38d20afba1042a83f393eff76a0a3d31

commit:     deb7b700064653a0d7617f9e726096f22d0f89a3
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 11:43:40 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 11:43:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb7b700

Merge branch 'pajot-master'

* pajot-master:
  app-office/texmaker: make qt5 default
  app-office/texmaker: version bump to 4.5 #566790

Closes: Github gentoo/gentoo#404

 app-office/texmaker/Manifest                       |  1 +
 ...yles.patch => texmaker-4.5-modern-styles.patch} |  0
 .../texmaker/files/texmaker-4.5-unbundle.patch     | 93 ++++++++++++++++++++
 app-office/texmaker/texmaker-4.5.ebuild            | 99 ++++++++++++++++++++++
 4 files changed, 193 insertions(+)