[gentoo-commits] proj/qt:master commit in: lxde-base/lxmenu-data/

[gentoo-commits] proj/qt:master commit in: lxde-base/lxmenu-data/

[Michael Palimaka]

commit:     a7def6e235d53a43ec9afd0735def5d213c1dcce
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon May 12 09:34:33 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon May 12 09:34:33 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a7def6e2

[lxde-base/lxmenu-data] Move blocker to RDEPEND for improved collision handling.

Package-Manager: portage-2.2.8-r1

---
 lxde-base/lxmenu-data/lxmenu-data-9999.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild b/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild
index ad81b56..ed0be67 100644
--- a/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild
+++ b/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild
@@ -24,10 +24,9 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND=""
+RDEPEND="!lxde-base/lxmenu-data"
 DEPEND="dev-util/intltool
 	sys-devel/gettext
-	virtual/pkgconfig
-	!lxde-base/lxmenu-data"
+	virtual/pkgconfig"
 
 DOCS=( AUTHORS README ) # ChangeLog is empty

[gentoo-commits] proj/qt:master commit in: lxde-base/lxmenu-data/

[Michael Palimaka]

commit:     a18e346f5e8f1336cd88a8002247feb72f02b105
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon May 12 09:43:34 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon May 12 09:43:34 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a18e346f

[lxde-base/lxmenu-data] Whitespace.

Package-Manager: portage-2.2.8-r1

---
 lxde-base/lxmenu-data/lxmenu-data-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild b/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild
index cdb5d2d..fdc3469 100644
--- a/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild
+++ b/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI=5
+
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 inherit autotools-utils
@@ -13,7 +14,6 @@ HOMEPAGE="http://www.lxqt.org/"
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-	
 	KEYWORDS=""
 else
 	SRC_URI="http://lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"

[gentoo-commits] proj/qt:master commit in: lxde-base/lxmenu-data/

[Michael Palimaka]

commit:     f797f8cadcee12282f73d4228c196c734473ea4a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon May 12 09:41:15 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon May 12 09:41:15 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f797f8ca

[lxde-base/lxmenu-data] Update license.

Upstream commit: d1ee782ab451ce6bf911f717bd8dbfca865e0605.

Package-Manager: portage-2.2.8-r1

---
 lxde-base/lxmenu-data/lxmenu-data-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild b/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild
index ed0be67..cdb5d2d 100644
--- a/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild
+++ b/lxde-base/lxmenu-data/lxmenu-data-9999.ebuild
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0"
 IUSE=""