summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /lxde-base
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'lxde-base')
-rw-r--r--lxde-base/lxappearance-obconf/Manifest1
-rw-r--r--lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild20
-rw-r--r--lxde-base/lxappearance-obconf/metadata.xml8
-rw-r--r--lxde-base/lxappearance/Manifest4
-rw-r--r--lxde-base/lxappearance/files/lxappearance-0.2.1-intltool.patch15
-rw-r--r--lxde-base/lxappearance/files/lxappearance-0.4.0-linguas.patch16
-rw-r--r--lxde-base/lxappearance/lxappearance-0.5.2.ebuild20
-rw-r--r--lxde-base/lxappearance/lxappearance-0.5.3.ebuild20
-rw-r--r--lxde-base/lxappearance/lxappearance-0.5.4.ebuild26
-rw-r--r--lxde-base/lxappearance/lxappearance-0.5.5.ebuild26
-rw-r--r--lxde-base/lxappearance/metadata.xml8
-rw-r--r--lxde-base/lxde-common/Manifest1
-rw-r--r--lxde-base/lxde-common/files/lxde90
-rw-r--r--lxde-base/lxde-common/files/lxde-common-0.5.0-desktop-icons.patch8
-rw-r--r--lxde-base/lxde-common/files/lxde-common-0.5.0-session-fix.patch11
-rw-r--r--lxde-base/lxde-common/files/lxde-common-0.5.5-logout.patch14
-rw-r--r--lxde-base/lxde-common/lxde-common-0.5.5-r2.ebuild46
-rw-r--r--lxde-base/lxde-common/lxde-common-0.5.5-r3.ebuild47
-rw-r--r--lxde-base/lxde-common/metadata.xml8
-rw-r--r--lxde-base/lxde-icon-theme/Manifest1
-rw-r--r--lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0-r1.ebuild34
-rw-r--r--lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0.ebuild20
-rw-r--r--lxde-base/lxde-icon-theme/metadata.xml8
-rw-r--r--lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild37
-rw-r--r--lxde-base/lxde-meta/metadata.xml5
-rw-r--r--lxde-base/lxdm/Manifest1
-rw-r--r--lxde-base/lxdm/files/lxdm-0.3.0-consolekit-disable.patch14
-rw-r--r--lxde-base/lxdm/files/lxdm-0.3.0-pam_console-disable.patch8
-rw-r--r--lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch32
-rw-r--r--lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch45
-rw-r--r--lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch25
-rw-r--r--lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch31
-rw-r--r--lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch16
-rw-r--r--lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch51
-rw-r--r--lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch29
-rw-r--r--lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch43
-rw-r--r--lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch15
-rw-r--r--lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch9
-rw-r--r--lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch7
-rw-r--r--lxde-base/lxdm/files/lxdm.service12
-rw-r--r--lxde-base/lxdm/lxdm-0.4.1-r9.ebuild90
-rw-r--r--lxde-base/lxdm/metadata.xml12
-rw-r--r--lxde-base/lxinput/Manifest1
-rw-r--r--lxde-base/lxinput/lxinput-0.3.2.ebuild21
-rw-r--r--lxde-base/lxinput/metadata.xml8
-rw-r--r--lxde-base/lxlauncher/Manifest1
-rw-r--r--lxde-base/lxlauncher/lxlauncher-0.2.2.ebuild30
-rw-r--r--lxde-base/lxlauncher/metadata.xml8
-rw-r--r--lxde-base/lxmenu-data/Manifest2
-rw-r--r--lxde-base/lxmenu-data/lxmenu-data-0.1.2.ebuild24
-rw-r--r--lxde-base/lxmenu-data/lxmenu-data-0.1.4.ebuild24
-rw-r--r--lxde-base/lxmenu-data/metadata.xml8
-rw-r--r--lxde-base/lxpanel/Manifest2
-rw-r--r--lxde-base/lxpanel/files/lxpanel-0.5.9-sandbox.patch29
-rw-r--r--lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch25
-rw-r--r--lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild74
-rw-r--r--lxde-base/lxpanel/lxpanel-0.8.1.ebuild72
-rw-r--r--lxde-base/lxpanel/metadata.xml8
-rw-r--r--lxde-base/lxpolkit/Manifest1
-rw-r--r--lxde-base/lxpolkit/lxpolkit-0.1.0-r1.ebuild30
-rw-r--r--lxde-base/lxpolkit/lxpolkit-0.1.0-r2.ebuild30
-rw-r--r--lxde-base/lxpolkit/metadata.xml8
-rw-r--r--lxde-base/lxrandr/Manifest1
-rw-r--r--lxde-base/lxrandr/lxrandr-0.1.2.ebuild30
-rw-r--r--lxde-base/lxrandr/metadata.xml8
-rw-r--r--lxde-base/lxsession-edit/Manifest1
-rw-r--r--lxde-base/lxsession-edit/lxsession-edit-0.2.0.ebuild29
-rw-r--r--lxde-base/lxsession-edit/metadata.xml8
-rw-r--r--lxde-base/lxsession/Manifest2
-rw-r--r--lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch13
-rw-r--r--lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch111
-rw-r--r--lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch13
-rw-r--r--lxde-base/lxsession/lxsession-0.4.6.1.ebuild38
-rw-r--r--lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild54
-rw-r--r--lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild57
-rw-r--r--lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild60
-rw-r--r--lxde-base/lxsession/lxsession-0.4.9.2.ebuild53
-rw-r--r--lxde-base/lxsession/metadata.xml8
-rw-r--r--lxde-base/lxshortcut/Manifest1
-rw-r--r--lxde-base/lxshortcut/lxshortcut-0.1.2.ebuild28
-rw-r--r--lxde-base/lxshortcut/metadata.xml8
-rw-r--r--lxde-base/lxtask/Manifest3
-rw-r--r--lxde-base/lxtask/files/lxtask-0.1.4-remove-broken-linguas.patch13
-rw-r--r--lxde-base/lxtask/files/lxtask-0.1.4-sandbox.patch21
-rw-r--r--lxde-base/lxtask/lxtask-0.1.4-r1.ebuild39
-rw-r--r--lxde-base/lxtask/lxtask-0.1.4.ebuild35
-rw-r--r--lxde-base/lxtask/lxtask-0.1.5.ebuild28
-rw-r--r--lxde-base/lxtask/lxtask-0.1.6.ebuild28
-rw-r--r--lxde-base/lxtask/metadata.xml8
-rw-r--r--lxde-base/lxterminal/Manifest2
-rw-r--r--lxde-base/lxterminal/lxterminal-0.1.11.ebuild27
-rw-r--r--lxde-base/lxterminal/lxterminal-0.2.0.ebuild27
-rw-r--r--lxde-base/lxterminal/metadata.xml8
-rw-r--r--lxde-base/menu-cache/Manifest4
-rw-r--r--lxde-base/menu-cache/menu-cache-0.3.3.ebuild19
-rw-r--r--lxde-base/menu-cache/menu-cache-0.4.1.ebuild20
-rw-r--r--lxde-base/menu-cache/menu-cache-0.5.1.ebuild20
-rw-r--r--lxde-base/menu-cache/menu-cache-1.0.0-r1.ebuild21
-rw-r--r--lxde-base/menu-cache/menu-cache-1.0.0.ebuild21
-rw-r--r--lxde-base/menu-cache/metadata.xml9
-rw-r--r--lxde-base/metadata.xml12
101 files changed, 2228 insertions, 0 deletions
diff --git a/lxde-base/lxappearance-obconf/Manifest b/lxde-base/lxappearance-obconf/Manifest
new file mode 100644
index 00000000000..547bd815150
--- /dev/null
+++ b/lxde-base/lxappearance-obconf/Manifest
@@ -0,0 +1 @@
+DIST lxappearance-obconf-0.2.1.tar.gz 418312 SHA256 a807aa16ebdca50d15309c133ba2473e9b982e62937a507b5798d82e461d5888 SHA512 f37a981005ba7c4d1ba0a00ec189d6978cd521b9742d0356f1b29685646f9cf78953c449bdee48fabff21e98f676d22c9916d03b0256d59e159f2947e4a41c5e WHIRLPOOL fe235c39a1e20d2bb5380f765d38d44cd3e338a118cb517254debeb784a8ae2e35ca1714c313ec01679a05784d36895fe7edf05d66fd0f974b9256c0a637f36c
diff --git a/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild
new file mode 100644
index 00000000000..ab490e93905
--- /dev/null
+++ b/lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="LXAppearance plugin for configuring OpenBox"
+HOMEPAGE="http://lxde.sourceforge.net"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~x86"
+IUSE=""
+
+RDEPEND="lxde-base/lxappearance
+ x11-wm/openbox"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-util/intltool "
diff --git a/lxde-base/lxappearance-obconf/metadata.xml b/lxde-base/lxappearance-obconf/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxappearance-obconf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxappearance/Manifest b/lxde-base/lxappearance/Manifest
new file mode 100644
index 00000000000..6ebd986bfca
--- /dev/null
+++ b/lxde-base/lxappearance/Manifest
@@ -0,0 +1,4 @@
+DIST lxappearance-0.5.2.tar.gz 278331 SHA256 a446aaad5572dd42845d41a20db76ca1fb1b93e3827db1bce243c9877e5996f4 SHA512 b08adf0cb9e5d3efe2d6be05c3fef99f18be6b4f85497951c111fde76010351b6265ea162acd8920ebb382c660d29d45a0a0bf601757d29739c8394b1328c0d5 WHIRLPOOL 029737bc5b6de5f7d15100fd60022af218252991ce983f432e9d67237390244d3bd1e660b0f35bf453fabaecacafc1c07566e174ad504b8c1e71ca2ea1386681
+DIST lxappearance-0.5.3.tar.gz 441698 SHA256 258069e61a1c898d1a095af25e386b3fcb79dc11024e4a0d9231a4316bfd1a2d SHA512 c0ac1f7e7d77bfebd160360047f341481ab0e7b91632924dbabfe957d282986a9d719e7ab708aacc7157559bb9bfdba3e7cfdbe50c4a8eef75581da1064e3c47 WHIRLPOOL e17e6514c402f4e7a2d0803123744851062295f5069a558a0577b711c567031ca2fe7fa31ea66eaa952489df3e5c53692222510f0ffdaf2e96d4e3b830ea52ca
+DIST lxappearance-0.5.4.tar.xz 295884 SHA256 beffc2553084ad32ab7bb424b9440c606410ca584770910a1c6ce2f9812ce5e8 SHA512 3d77dff84d221834cb7c0c124f25ea7ec736c7722c6042136986bbf1263199ac38621d1bb295eae35a6d596ba8614081f0f455d5bfada2d97a5d462515ab9e60 WHIRLPOOL d06f9cbb65fd22f7a43273cc66b1109ef4a2c1393fd40df2c6f1bed10e64322161926ae467c2cd2bc04280a7d4d402819cab02e54f4f2cf82498919800fde19e
+DIST lxappearance-0.5.5.tar.xz 295756 SHA256 8cae82e6425ba8a0267774e4d10096df2d91b0597520058331684a5ece068b4c SHA512 7e6740b598f2b2856650fe94ccdfea94a0717c27dee6415b3abc58b0587acdca6aef22be7ec950e7c76127ef414f06eb70bfdea5f9324d2fb99cbbf2bf78522d WHIRLPOOL d60dc308e7c08e105100f9c1624987abf6fbe16529b0b3dd9870e16de8abeae2247f5b5f13f0c4655a2a11e5b46f8a8d73b3aeddf2e4a348f64d79eae6328835
diff --git a/lxde-base/lxappearance/files/lxappearance-0.2.1-intltool.patch b/lxde-base/lxappearance/files/lxappearance-0.2.1-intltool.patch
new file mode 100644
index 00000000000..b3871d357b5
--- /dev/null
+++ b/lxde-base/lxappearance/files/lxappearance-0.2.1-intltool.patch
@@ -0,0 +1,15 @@
+diff -NrU5 lxappearance-0.2.1.original/configure.in lxappearance-0.2.1/configure.in
+--- lxappearance-0.2.1.original/configure.in 2009-07-13 17:14:23.000000000 +0000
++++ lxappearance-0.2.1/configure.in 2009-07-13 17:14:41.000000000 +0000
+@@ -2,10 +2,11 @@
+
+ AC_INIT(configure.in)
+ AM_INIT_AUTOMAKE(lxappearance, 0.2.1)
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
++IT_PROG_INTLTOOL
+
+ AC_ISC_POSIX
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
diff --git a/lxde-base/lxappearance/files/lxappearance-0.4.0-linguas.patch b/lxde-base/lxappearance/files/lxappearance-0.4.0-linguas.patch
new file mode 100644
index 00000000000..e73a5416b28
--- /dev/null
+++ b/lxde-base/lxappearance/files/lxappearance-0.4.0-linguas.patch
@@ -0,0 +1,16 @@
+diff -NrU5 lxappearance-0.4.0.original/configure lxappearance-0.4.0/configure
+--- lxappearance-0.4.0.original/configure 2010-01-22 16:13:41.000000000 -0600
++++ lxappearance-0.4.0/configure 2010-01-22 16:25:03.000000000 -0600
+@@ -6248,11 +6248,11 @@
+ cat >>confdefs.h <<_ACEOF
+ #define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+ _ACEOF
+
+
+-ALL_LINGUAS="af ar be@latin bg bn bn_IN ca cs da de dz el en_GB es et eu fa fi fr frp gl gu he hr hu id it ja ka ko lt mk ml ms nb nl nn oc pa pl ps pt pt_BR ru sk sl sr sr@Latn sv ta th tr uk ur ur_PK vi zh_CN zh_TW"
++ALL_LINGUAS="af ar bg bn_IN ca cs da de el es et eu fa fi fr gl he hr hu id it ja ko lt ml ms nb nl nn pl ps pt pt_BR ru sk sl sr sv tr uk ur ur_PK vi zh_CN zh_TW"
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/lxde-base/lxappearance/lxappearance-0.5.2.ebuild b/lxde-base/lxappearance/lxappearance-0.5.2.ebuild
new file mode 100644
index 00000000000..6031207e09a
--- /dev/null
+++ b/lxde-base/lxappearance/lxappearance-0.5.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="LXDE GTK+ theme switcher"
+HOMEPAGE="http://lxde.sourceforge.net"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ppc x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-util/intltool
+ sys-devel/gettext"
diff --git a/lxde-base/lxappearance/lxappearance-0.5.3.ebuild b/lxde-base/lxappearance/lxappearance-0.5.3.ebuild
new file mode 100644
index 00000000000..6f9d49f722c
--- /dev/null
+++ b/lxde-base/lxappearance/lxappearance-0.5.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="LXDE GTK+ theme switcher"
+HOMEPAGE="http://lxde.sourceforge.net"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-util/intltool
+ sys-devel/gettext"
diff --git a/lxde-base/lxappearance/lxappearance-0.5.4.ebuild b/lxde-base/lxappearance/lxappearance-0.5.4.ebuild
new file mode 100644
index 00000000000..608db9f3f9b
--- /dev/null
+++ b/lxde-base/lxappearance/lxappearance-0.5.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="LXDE GTK+ theme switcher"
+HOMEPAGE="http://lxde.sourceforge.net"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="dbus"
+
+RDEPEND="x11-libs/gtk+:2
+ dbus? ( dev-libs/dbus-glib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-util/intltool
+ sys-devel/gettext"
+
+src_configure() {
+ econf \
+ $(use_enable dbus)
+}
diff --git a/lxde-base/lxappearance/lxappearance-0.5.5.ebuild b/lxde-base/lxappearance/lxappearance-0.5.5.ebuild
new file mode 100644
index 00000000000..d36fc0717e4
--- /dev/null
+++ b/lxde-base/lxappearance/lxappearance-0.5.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="LXDE GTK+ theme switcher"
+HOMEPAGE="http://lxde.sourceforge.net"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="dbus"
+
+RDEPEND="x11-libs/gtk+:2
+ dbus? ( dev-libs/dbus-glib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-util/intltool
+ sys-devel/gettext"
+
+src_configure() {
+ econf \
+ $(use_enable dbus)
+}
diff --git a/lxde-base/lxappearance/metadata.xml b/lxde-base/lxappearance/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxappearance/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxde-common/Manifest b/lxde-base/lxde-common/Manifest
new file mode 100644
index 00000000000..4dbbc8f49b9
--- /dev/null
+++ b/lxde-base/lxde-common/Manifest
@@ -0,0 +1 @@
+DIST lxde-common-0.5.5.tar.gz 899075 SHA256 ee18a09b64a442b33c1b54f0269649a1b4d9490460c400a07ed785d41bf6dde6 SHA512 44848286ccf3aa269df1680e14a8d3c41be1c2af956bd5121fc05d97a892fdc13d1e74191a2a11a40e96a8f31f8be37b1cfb9afeac4474fcab88d07508647c7f WHIRLPOOL 60423eb159fabba12394609b7538e63342c8c39ca38be441d930923deb25116ff1bc0e01d6aa25cfd53d202b426cd9b9fac9410de9c07f211e1b753fe44d4264
diff --git a/lxde-base/lxde-common/files/lxde b/lxde-base/lxde-common/files/lxde
new file mode 100644
index 00000000000..489ce2d1fe3
--- /dev/null
+++ b/lxde-base/lxde-common/files/lxde
@@ -0,0 +1,90 @@
+#!/bin/sh
+# LXDE Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.lxde-errors" "${TMPDIR-/tmp}/lxde-$USER" "/tmp/lxde-$USER"
+do
+ if ( cp /dev/null "$errfile" 2> /dev/null )
+ then
+ chmod 600 "$errfile"
+ exec > "$errfile" 2>&1
+ break
+ fi
+done
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+ xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+ xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+ xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+ setxkbmap `cat "$sysxkbmap"`
+ XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+ setxkbmap `cat "$userxkbmap"`
+ XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+ if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+ xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf`
+ if [ -n "$xkbsymbols" ]; then
+ setxkbmap -symbols "$xkbsymbols"
+ XKB_IN_USE=yes
+ fi
+ fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+ if [ -f "$rh6sysmodmap" ]; then
+ xmodmap "$rh6sysmodmap"
+ fi
+
+ if [ -f "$sysmodmap" ]; then
+ xmodmap "$sysmodmap"
+ fi
+
+ if [ -f "$usermodmap" ]; then
+ xmodmap "$usermodmap"
+ fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+ for i in /etc/X11/xinit/xinitrc.d/* ; do
+ if [ -x "$i" ]; then
+ . "$i"
+ fi
+ done
+fi
+
+exec /usr/bin/startlxde
diff --git a/lxde-base/lxde-common/files/lxde-common-0.5.0-desktop-icons.patch b/lxde-base/lxde-common/files/lxde-common-0.5.0-desktop-icons.patch
new file mode 100644
index 00000000000..c751ae64dba
--- /dev/null
+++ b/lxde-base/lxde-common/files/lxde-common-0.5.0-desktop-icons.patch
@@ -0,0 +1,8 @@
+diff -NrU5 lxde-common-0.5.0.original/autostart lxde-common-0.5.0/autostart
+--- lxde-common-0.5.0.original/autostart 2009-07-14 13:39:53.000000000 +0200
++++ lxde-common-0.5.0/autostart 2010-07-29 15:42:14.585488801 +0200
+@@ -1,3 +1,3 @@
+ @xscreensaver -no-splash
+ @lxpanel --profile LXDE
+-@pcmanfm -d
++@pcmanfm --desktop
diff --git a/lxde-base/lxde-common/files/lxde-common-0.5.0-session-fix.patch b/lxde-base/lxde-common/files/lxde-common-0.5.0-session-fix.patch
new file mode 100644
index 00000000000..23a5438f032
--- /dev/null
+++ b/lxde-base/lxde-common/files/lxde-common-0.5.0-session-fix.patch
@@ -0,0 +1,11 @@
+diff -NrU5 lxde-common-0.5.0.original/startlxde.in lxde-common-0.5.0/startlxde.in
+--- lxde-common-0.5.0.original/startlxde.in 2010-01-21 09:18:33.000000000 -0600
++++ lxde-common-0.5.0/startlxde.in 2010-01-21 09:19:12.000000000 -0600
+@@ -23,6 +23,6 @@
+
+ # Enable GTK+2 integration for OpenOffice.org, if available.
+ export SAL_USE_VCLPLUGIN=gtk
+
+ # Start the LXDE session
+-exec @prefix@/bin/lxsession -s LXDE
++exec @prefix@/bin/lxsession -s LXDE -e LXDE
diff --git a/lxde-base/lxde-common/files/lxde-common-0.5.5-logout.patch b/lxde-base/lxde-common/files/lxde-common-0.5.5-logout.patch
new file mode 100644
index 00000000000..129fb9a5b1a
--- /dev/null
+++ b/lxde-base/lxde-common/files/lxde-common-0.5.5-logout.patch
@@ -0,0 +1,14 @@
+Index: lxde-common-0.5.5/Makefile.am
+===================================================================
+--- lxde-common-0.5.5.orig/Makefile.am
++++ lxde-common-0.5.5/Makefile.am
+@@ -20,6 +20,9 @@ images_DATA= \
+ images/logout-banner.png \
+ images/lxde-icon.png
+
++lxlogoutdir=$(datadir)/applications/
++lxlogout_DATA=lxde-logout.desktop
++
+ lxpaneldir=$(datadir)/lxpanel/profile/LXDE
+ lxpanel_DATA=lxpanel/config
+
diff --git a/lxde-base/lxde-common/lxde-common-0.5.5-r2.ebuild b/lxde-base/lxde-common/lxde-common-0.5.5-r2.ebuild
new file mode 100644
index 00000000000..85496ca838d
--- /dev/null
+++ b/lxde-base/lxde-common/lxde-common-0.5.5-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="LXDE Session default configuration files and nuoveXT2 iconset"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext"
+PDEPEND="lxde-base/lxde-icon-theme"
+
+src_prepare() {
+ #bug 380043
+ epatch "${FILESDIR}"/${P}-logout.patch
+
+ # Rerun autotools
+ einfo "Regenerating autotools files..."
+ eautoreconf
+}
+
+src_install () {
+ emake DESTDIR="${D}" install
+ # install session file
+ insinto /etc/X11/Sessions/
+ doins ${FILESDIR}/lxde
+ dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst() {
+ elog "${P} has renamed the configuration file name to"
+ elog "/etc/xdg/lxsession/LXDE/desktop.conf"
+ elog "Keep in mind you have to migrate your custom settings"
+ elog "from /etc/xdg/lxsession/LXDE/config"
+}
diff --git a/lxde-base/lxde-common/lxde-common-0.5.5-r3.ebuild b/lxde-base/lxde-common/lxde-common-0.5.5-r3.ebuild
new file mode 100644
index 00000000000..52c95616114
--- /dev/null
+++ b/lxde-base/lxde-common/lxde-common-0.5.5-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="LXDE Session default configuration files and nuoveXT2 iconset"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext"
+PDEPEND="lxde-base/lxde-icon-theme"
+
+src_prepare() {
+ #bug 380043
+ epatch "${FILESDIR}"/${P}-logout.patch
+
+ # Rerun autotools
+ einfo "Regenerating autotools files..."
+ eautoreconf
+}
+
+src_install () {
+ emake DESTDIR="${D}" install
+ # install session file
+ insinto /etc/X11/Sessions/
+ doins ${FILESDIR}/lxde
+ fperms 755 /etc/X11/Sessions/lxde
+ dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst() {
+ elog "${P} has renamed the configuration file name to"
+ elog "/etc/xdg/lxsession/LXDE/desktop.conf"
+ elog "Keep in mind you have to migrate your custom settings"
+ elog "from /etc/xdg/lxsession/LXDE/config"
+}
diff --git a/lxde-base/lxde-common/metadata.xml b/lxde-base/lxde-common/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxde-common/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxde-icon-theme/Manifest b/lxde-base/lxde-icon-theme/Manifest
new file mode 100644
index 00000000000..bc46677f9d0
--- /dev/null
+++ b/lxde-base/lxde-icon-theme/Manifest
@@ -0,0 +1 @@
+DIST lxde-icon-theme-0.5.0.tar.bz2 4545598 SHA256 49dc61c46c4a0ca9298f9e0866bcf7212a08ddaa71f15bfabfb0220fe1efa848 SHA512 4ca3e94b5826f7fe87d840feddf0c130fa77e8f14f22a59d9749252a5106d54661237e3c9286f4880d0aaa50bd330cb4bfb9d663ca35d6ee4b9e3c2af30fe9ab WHIRLPOOL 79b7aa6a42e28086f2d88d1482d211b1c70350af7cb925ce222e222f39cbc547f8269aad31370af15308295d42f587d369a3575cfa540c198693aeccc43fe534
diff --git a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0-r1.ebuild b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0-r1.ebuild
new file mode 100644
index 00000000000..411b72dbd1c
--- /dev/null
+++ b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit gnome2-utils
+
+DESCRIPTION="nuoveXT2 iconset"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/LXDE%20Icon%20Theme/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ !<lxde-base/lxde-common-0.5.0"
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0.ebuild b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0.ebuild
new file mode 100644
index 00000000000..5dc02791137
--- /dev/null
+++ b/lxde-base/lxde-icon-theme/lxde-icon-theme-0.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="nuoveXT2 iconset"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/LXDE%20Icon%20Theme/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ !<lxde-base/lxde-common-0.5.0"
diff --git a/lxde-base/lxde-icon-theme/metadata.xml b/lxde-base/lxde-icon-theme/metadata.xml
new file mode 100644
index 00000000000..4c465c546c7
--- /dev/null
+++ b/lxde-base/lxde-icon-theme/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild b/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild
new file mode 100644
index 00000000000..fec53c1d1a3
--- /dev/null
+++ b/lxde-base/lxde-meta/lxde-meta-0.5.5-r4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+DESCRIPTION="Meta ebuild for LXDE, the Lightweight X11 Desktop Environment"
+HOMEPAGE="http://lxde.sf.net/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86"
+IUSE=""
+
+RDEPEND=">=lxde-base/menu-cache-0.3.3
+ =lxde-base/lxappearance-0.5*
+ =lxde-base/lxde-icon-theme-0.5*
+ =lxde-base/lxde-common-0.5.5*
+ =lxde-base/lxmenu-data-0.1*
+ =lxde-base/lxinput-0.3*
+ >=lxde-base/lxpanel-0.5.10
+ =lxde-base/lxrandr-0.1*
+ || ( ( <=lxde-base/lxsession-0.4.6.1
+ =lxde-base/lxsession-edit-0.2* )
+ >lxde-base/lxsession-0.4.6.1 )
+ || ( >=x11-libs/libfm-1.2.0 =lxde-base/lxshortcut-0.1* )
+ =lxde-base/lxtask-0.1*
+ >=lxde-base/lxterminal-0.1.11
+ media-gfx/gpicview
+ x11-misc/pcmanfm
+ x11-wm/openbox
+ >=x11-misc/obconf-2.0.3_p20111019"
+
+pkg_postinst() {
+ elog "For your convenience you can review the LXDE Configuration HOWTO at"
+ elog "http://www.gentoo.org/proj/en/desktop/lxde/lxde-howto.xml"
+}
diff --git a/lxde-base/lxde-meta/metadata.xml b/lxde-base/lxde-meta/metadata.xml
new file mode 100644
index 00000000000..34a29015776
--- /dev/null
+++ b/lxde-base/lxde-meta/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+</pkgmetadata>
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
new file mode 100644
index 00000000000..a9f2f860ca9
--- /dev/null
+++ b/lxde-base/lxdm/Manifest
@@ -0,0 +1 @@
+DIST lxdm-0.4.1.tar.gz 296714 SHA256 9e0d0a5672fcf31a18de8178ce73eab1723d6ae7097dfe41e9fe2c46e180cf08 SHA512 8ed4a955a910def4db66958d1cb24976db178b8763199a024b6c2119894745e3646566c42d01472dffbbcbb7fd21784b01e74dc88038e01caebaa3b6d720ff27 WHIRLPOOL 1bbb55bf955f46aaac54ca3372c09308baa496297e56026456e464217f115d6b26994e8be6b6b228b663bb2e14cf9d5ace6930f75024f6426825dd4fefc5349f
diff --git a/lxde-base/lxdm/files/lxdm-0.3.0-consolekit-disable.patch b/lxde-base/lxdm/files/lxdm-0.3.0-consolekit-disable.patch
new file mode 100644
index 00000000000..3d02d32b17c
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.3.0-consolekit-disable.patch
@@ -0,0 +1,14 @@
+--- lxdm-0.3.0-old/src/lxdm.c
++++ lxdm-0.3.0/src/lxdm.c
+@@ -1332,4 +1332,5 @@
+ if(option)
+ s->option=g_strdup(option);
++#if HAVE_LIBCK_CONNECTOR
+ if(s->ckc)
+ {
+@@ -1337,4 +1338,5 @@
+ s->ckc=NULL;
+ }
++#endif
+ #if HAVE_LIBPAM
+ setup_pam_session(s,pw,session_name);
diff --git a/lxde-base/lxdm/files/lxdm-0.3.0-pam_console-disable.patch b/lxde-base/lxdm/files/lxdm-0.3.0-pam_console-disable.patch
new file mode 100644
index 00000000000..c920bc85c3e
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.3.0-pam_console-disable.patch
@@ -0,0 +1,8 @@
+--- lxdm-0.2.0.a/pam/lxdm
++++ lxdm-0.2.0.b/pam/lxdm
+@@ -4,4 +4,4 @@
+ session optional pam_keyinit.so force revoke
+ session include system-auth
+ session required pam_loginuid.so
+-session optional pam_console.so
++# session optional pam_console.so
diff --git a/lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch b/lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch
new file mode 100644
index 00000000000..928fd2b9413
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch
@@ -0,0 +1,32 @@
+diff -Nurp lxdm-0.3.0.orig/src/lxdm.c lxdm-0.3.0/src/lxdm.c
+--- lxdm-0.3.0.orig/src/lxdm.c 2011-07-03 01:53:26.262780480 +0200
++++ lxdm-0.3.0/src/lxdm.c 2011-07-03 01:52:11.975780526 +0200
+@@ -1174,7 +1174,27 @@ gboolean lxdm_get_session_info(char *ses
+ }
+ else
+ {
+- name=g_strdup(session);
++ GKeyFile *f;
++ char *file_path;
++ gboolean loaded;
++
++ f = g_key_file_new();
++ char *desktop_name = g_strconcat(session, ".desktop", NULL);
++ file_path = g_build_filename(XSESSIONS_DIR, desktop_name, NULL);
++ loaded = g_key_file_load_from_file(f, file_path, G_KEY_FILE_NONE, NULL);
++ g_free(file_path);
++ g_free(desktop_name);
++
++ if ( loaded )
++ {
++ name = g_key_file_get_locale_string(f, "Desktop Entry", "Name", NULL, NULL);
++ exec = g_key_file_get_string(f, "Desktop Entry", "Exec", NULL);
++ }
++ else
++ {
++ name=g_strdup(session);
++ }
++ g_key_file_free(f);
+ }
+ }
+ if(name && !exec)
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch b/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch
new file mode 100644
index 00000000000..d91bf75a67b
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-configure-add-pam.patch
@@ -0,0 +1,45 @@
+From 949ee91acb55baeb4b8761957eabd2e5a345d2ae Mon Sep 17 00:00:00 2001
+From: Mitch Harder <mitch.harder@sabayonlinux.org>
+Date: Thu, 8 Dec 2011 11:02:28 -0600
+Subject: Fix configure.ac test for pam libs.
+
+A bug report on Gentoo noted that the configure test for pam
+wasn't working correctly.
+https://bugs.gentoo.org/show_bug.cgi?id=384615
+
+This corrections borrows the configure.ac pam testing method used in xdm.
+---
+ configure.ac | 13 +++++++++++--
+ 1 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e952473..eaa883a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,12 +14,21 @@ AC_PROG_INSTALL
+ AM_PROG_CC_C_O
+
+ # Checks for libraries.
+ AC_CHECK_LIB([crypt], [crypt])
+
+-AC_ARG_WITH(pam,AC_HELP_STRING([--without-pam],[build without pam]),
+-[],[AC_CHECK_LIB([pam], [pam_open_session])])
++# Check for PAM support
++AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam],[Use PAM for authentication]),
++ [USE_PAM=$withval], [USE_PAM=$use_pam_default])
++if test "x$USE_PAM" != "xno" ; then
++ AC_SEARCH_LIBS(pam_open_session,[pam])
++ AC_CHECK_FUNC(pam_open_session,
++ [AC_DEFINE(USE_PAM,1,[Use PAM for authentication])],
++ [if test "x$USE_PAM" != "xtry" ; then
++ AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."])
++ fi])
++fi
+
+ AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
+
+ # Checks for header files.
+ AC_PATH_X
+--
+1.7.3.4
+
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch b/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch
new file mode 100644
index 00000000000..4c2d5b35235
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch
@@ -0,0 +1,25 @@
+From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001
+From: dgod <dgod.osa@gmail.com>
+Date: Sun, 25 Dec 2011 15:23:19 +0800
+Subject: [PATCH 1/1] fix event check bug caused cpu 100%
+
+---
+ src/lxcom.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/lxcom.c b/src/lxcom.c
+index 02763eb..18ee12e 100644
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
+
+ static gboolean lxcom_check(GSource *source)
+ {
+- return TRUE;
++ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
+ }
+
+ static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
+--
+1.7.4.1
+
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch
new file mode 100644
index 00000000000..0aecc08593d
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-fix-optional-pam.patch
@@ -0,0 +1,31 @@
+diff --git a/Makefile.am b/Makefile.am
+index bfac56b..40710fc 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,10 +2,13 @@ NULL =
+ SUBDIRS= \
+ src \
+ po \
+- pam \
+ data \
+ $(NULL)
+
++if HAVE_PAM
++SUBDIRS += pam
++endif
++
+ rpm: dist @PACKAGE_NAME@.spec
+ rpmbuild -bb \
+ --define "_sourcedir `pwd`" \
+diff --git a/configure.ac b/configure.ac
+index ae5177f..aaa1bad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,6 +27,7 @@ if test "x$USE_PAM" != "xno" ; then
+ AC_MSG_ERROR(["PAM support requested, but pam_open_session not found."])
+ fi])
+ fi
++AM_CONDITIONAL(HAVE_PAM, [test -n "$USE_PAM" -a "x$USE_PAM" != xno ])
+
+ # Checks for header files.
+ AC_PATH_X
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch b/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch
new file mode 100644
index 00000000000..103268efec4
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-fix-pam-100-cpu.patch
@@ -0,0 +1,16 @@
+--- lxdm-0.4.1.orig/src/lxdm.c
++++ lxdm-0.4.1/src/lxdm.c
+@@ -1458,8 +1458,12 @@ void lxdm_do_login(struct passwd *pw, ch
+ setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1);
+ }
+ #endif
++ int i;
++ for(i=2;i<256;i++)
++ g_source_remove(i);
++
+ char** env, *path;
+- int n_env,i;
++ int n_env;
+ n_env = g_strv_length(environ);
+ /* copy all environment variables and override some of them */
+ env = g_new(char*, n_env + 1 + 13);
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch b/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch
new file mode 100644
index 00000000000..7abdbd47052
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-git-fix-null-pointer-deref.patch
@@ -0,0 +1,51 @@
+From 19f82a206b2cec964cea0475395d63dedf183788 Mon Sep 17 00:00:00 2001
+From: Andrea Florio <andrea@opensuse.org>
+Date: Fri, 29 Jul 2011 23:59:32 +0200
+Subject: [PATCH] fix null pointer dereference
+
+---
+ src/config.c | 25 ++++++++++---------------
+ 1 files changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/config.c b/src/config.c
+index 3f92f7b..4603ab4 100644
+--- a/src/config.c
++++ b/src/config.c
+@@ -125,24 +125,19 @@ static gboolean image_file_valid(const char *filename)
+ static void update_face_image(GtkWidget *w)
+ {
+ GdkPixbuf *pixbuf;
+- char *path;
+- path=g_build_filename(user->pw_dir,".face",NULL);
+- if(access(path,R_OK))
+- {
+- g_free(path);
+- if(ui_nobody)
+- pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
+- if(!pixbuf)
+- pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
++ char *path=g_build_filename(user->pw_dir,".face",NULL);
++ pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
++ g_free(path);
++ if(!pixbuf && ui_nobody)
++ pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL);
++ if(!pixbuf)
++ pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
+ "avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL);
+- }
+- else
++ if(pixbuf)
+ {
+- pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL);
+- g_free(path);
++ gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
++ g_object_unref(pixbuf);
+ }
+- gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf);
+- g_object_unref(pixbuf);
+ }
+
+ static void set_face_file(const char *filename)
+--
+1.7.0.1
+
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch b/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch
new file mode 100644
index 00000000000..a59273ccf40
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-missing-pam-defines.patch
@@ -0,0 +1,29 @@
+From 0f9e8e53a8d30f5c8ccfb03edc282148f58bfd30 Mon Sep 17 00:00:00 2001
+From: dgod <dgod.osa@gmail.com>
+Date: Sun, 1 Jan 2012 17:05:22 +0800
+Subject: [PATCH] fix bug introduced from pam detect
+
+---
+ src/lxdm.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/lxdm.c b/src/lxdm.c
+index b5a90be..07be1e0 100644
+--- a/src/lxdm.c
++++ b/src/lxdm.c
+@@ -25,8 +25,12 @@
+ #include <config.h>
+ #endif
+ #ifndef HAVE_LIBPAM
++#ifdef USE_PAM
++#define HAVE_LIBPAM 1
++#else
+ #define HAVE_LIBPAM 0
+ #endif
++#endif
+
+ #include <stdio.h>
+ #include <stdlib.h>
+--
+1.7.4.1
+
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch
new file mode 100644
index 00000000000..621a9d62e45
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch
@@ -0,0 +1,43 @@
+X-Gentoo-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=443666
+X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxdm;a=patch;h=902438eb83b4ae97d774e4e5f38b46f2d826df2f
+X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxdm;a=patch;h=371b018474217bdff1d5108b384fbf0f45aa873d
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
+Index: lxdm-0.4.1/configure.ac
+===================================================================
+--- lxdm-0.4.1.orig/configure.ac
++++ lxdm-0.4.1/configure.ac
+@@ -28,8 +28,6 @@ if test "x$USE_PAM" != "xno" ; then
+ fi])
+ fi
+
+-AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
+-
+ # Checks for header files.
+ AC_PATH_X
+ AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
+@@ -89,11 +87,22 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules])
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+
+-PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[
++
++AC_ARG_ENABLE(consolekit,
++ AC_HELP_STRING([--disable-consolekit],[disable ConsoleKit support]),
++ [enable_consolekit=$enableval],
++ [enable_consolekit=yes]
++)
++
++if test "x$enable_consolekit" = "xyes" ; then
++ AC_CHECK_LIB([ck-connector],[ck_connector_open_session])
++ PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[
+ AC_SUBST(CONSOLEKIT_CFLAGS)
+ AC_SUBST(CONSOLEKIT_LIBS)],[
+ echo "ConsoleKit devel package not found"
+ ])
++fi
++
+
+ AC_ARG_ENABLE(password,
+ AC_HELP_STRING([--enable-password],[enable to load autologin password store at config file]),
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch b/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch
new file mode 100644
index 00000000000..9f723a2f2be
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-pam-use-system-local-login.patch
@@ -0,0 +1,15 @@
+--- lxdm-0.4.1.orig/pam/lxdm
++++ lxdm-0.4.1/pam/lxdm
+@@ -1,9 +1,9 @@
+ #%PAM-1.0
+-auth substack system-auth
++auth substack system-local-login
+ auth optional pam_gnome_keyring.so
+-account include system-auth
++account include system-local-login
+ session optional pam_keyinit.so force revoke
+-session include system-auth
++session include system-local-login
+ session required pam_loginuid.so
+ #session optional pam_console.so
+ session optional pam_gnome_keyring.so auto_start
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch b/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch
new file mode 100644
index 00000000000..628e9a51110
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-pam_console-disable.patch
@@ -0,0 +1,9 @@
+--- lxdm-0.4.0.orig/pam/lxdm
++++ lxdm-0.4.0/pam/lxdm
+@@ -5,5 +5,5 @@ account include system-auth
+ session optional pam_keyinit.so force revoke
+ session include system-auth
+ session required pam_loginuid.so
+-session optional pam_console.so
++#session optional pam_console.so
+ session optional pam_gnome_keyring.so auto_start
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch b/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch
new file mode 100644
index 00000000000..c7df391b104
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-selinux-support.patch
@@ -0,0 +1,7 @@
+--- a/pam/lxdm 2011-12-05 17:30:39.749064359 -0600
++++ b/pam/lxdm 2011-12-05 17:31:19.355569211 -0600
+@@ -7,3 +7,4 @@
+ session required pam_loginuid.so
+ #session optional pam_console.so
+ session optional pam_gnome_keyring.so auto_start
++session optional pam_selinux.so
diff --git a/lxde-base/lxdm/files/lxdm.service b/lxde-base/lxdm/files/lxdm.service
new file mode 100644
index 00000000000..bf4a0a800f2
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=LXDE Display Manager
+Conflicts=getty@tty1.service plymouth-quit.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/usr/sbin/lxdm
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+Alias=display-manager.service
diff --git a/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild
new file mode 100644
index 00000000000..9aa3010b80d
--- /dev/null
+++ b/lxde-base/lxdm/lxdm-0.4.1-r9.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+WANT_AUTOMAKE="1.12" #493996
+inherit eutils autotools systemd
+
+DESCRIPTION="LXDE Display Manager"
+HOMEPAGE="http://lxde.org"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+
+IUSE="consolekit debug gtk3 nls pam"
+
+RDEPEND="consolekit? ( sys-auth/consolekit )
+ x11-libs/libxcb
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:2 )
+ nls? ( sys-devel/gettext )
+ pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig"
+
+src_prepare() {
+ # Upstream bug, tarball contains pre-made lxdm.conf
+ rm "${S}"/data/lxdm.conf || die
+
+ # There is consolekit
+ epatch "${FILESDIR}/${P}-pam_console-disable.patch"
+ # Fix null pointer dereference, backported from git
+ epatch "${FILESDIR}/${P}-git-fix-null-pointer-deref.patch"
+
+ epatch "${FILESDIR}"/${P}-configure-add-pam.patch
+
+ # 403999
+ epatch "${FILESDIR}"/${P}-missing-pam-defines.patch
+
+ # 412025
+ epatch "${FILESDIR}"/${P}-event-check.patch
+
+ # 393329 Selinux support
+ epatch "${FILESDIR}"/${P}-selinux-support.patch
+
+ # See https://bugs.launchpad.net/ubuntu/+source/lxdm/+bug/922363
+ epatch "${FILESDIR}/${P}-fix-pam-100-cpu.patch"
+
+ # Optional Consolekit support. bug #443666
+ epatch "${FILESDIR}"/${P}-optional-consolekit.patch
+
+ # 469512
+ epatch "${FILESDIR}"/${P}-fix-optional-pam.patch
+
+ # this replaces the bootstrap/autogen script in most packages
+ eautoreconf
+
+ # process LINGUAS
+ if use nls; then
+ einfo "Running intltoolize ..."
+ intltoolize --force --copy --automake || die
+ strip-linguas -i "${S}/po" || die
+ fi
+}
+src_configure() {
+ econf --enable-password \
+ --with-x \
+ --with-xconn=xcb \
+ $(use_enable consolekit) \
+ $(use_enable gtk3) \
+ $(use_enable nls) \
+ $(use_enable debug) \
+ $(use_with pam)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS README TODO || die
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+ echo
+ elog "Take into consideration that LXDM is in the early stages of development!"
+ echo
+}
diff --git a/lxde-base/lxdm/metadata.xml b/lxde-base/lxdm/metadata.xml
new file mode 100644
index 00000000000..76c9155f289
--- /dev/null
+++ b/lxde-base/lxdm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <use>
+ <flag name="consolekit">Enables support for authorization using consolekit</flag>
+ <flag name="gtk3">Use GTK+3 instead of 2</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxinput/Manifest b/lxde-base/lxinput/Manifest
new file mode 100644
index 00000000000..9d64b5a5262
--- /dev/null
+++ b/lxde-base/lxinput/Manifest
@@ -0,0 +1 @@
+DIST lxinput-0.3.2.tar.gz 259203 SHA256 481622f9f73c7d622a712df55d509a18805758ee002cbbc36efbd73bedd8205f SHA512 50921151d3050fae1e4640aade2b0bf88d94445f95e18c21c3d67a012ec7d33b6b9dada8574898d915a350c37fcd568f376bafff1b804e222543a5cadf87431a WHIRLPOOL 2b8f6af9ec02dc7d33786196597f8ceeff7d598caba67ae6e21f040363d059ef4959f7d82dfefbd5b9462a7f181d452b3491d552392ff69416a41ad1aaaedfbb
diff --git a/lxde-base/lxinput/lxinput-0.3.2.ebuild b/lxde-base/lxinput/lxinput-0.3.2.ebuild
new file mode 100644
index 00000000000..09696ab772e
--- /dev/null
+++ b/lxde-base/lxinput/lxinput-0.3.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="LXDE keyboard and mouse configuration tool"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40.0"
diff --git a/lxde-base/lxinput/metadata.xml b/lxde-base/lxinput/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxinput/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxlauncher/Manifest b/lxde-base/lxlauncher/Manifest
new file mode 100644
index 00000000000..febac936ac4
--- /dev/null
+++ b/lxde-base/lxlauncher/Manifest
@@ -0,0 +1 @@
+DIST lxlauncher-0.2.2.tar.gz 236484 SHA256 ad586e3a2668f98bbf0217ec1be1f8f1be4ff876b180a407c7db2fe354303cbc SHA512 f7249216b1b474945ee370f76433480d9e275c8b3375328183681083af10dc5a53d48606c00b948dc19f4c0b7d84573b65d52e122b472c69ff34becf953232a6 WHIRLPOOL 6d351f4c0cf43bfaaf820dc02cd0b860afea2b3a6307ead734c79835b6c0d945faf73c6f8fbc8403b10a12d2221981339ddff79bfa69e8f7d599ce861590365e
diff --git a/lxde-base/lxlauncher/lxlauncher-0.2.2.ebuild b/lxde-base/lxlauncher/lxlauncher-0.2.2.ebuild
new file mode 100644
index 00000000000..a91b3d0057c
--- /dev/null
+++ b/lxde-base/lxlauncher/lxlauncher-0.2.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="An open source clone of the Asus launcher for EeePC"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/gtk+:2
+ gnome-base/gnome-menus
+ x11-libs/startup-notification"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dev-util/intltool
+ sys-devel/gettext
+ lxde-base/menu-cache
+ !lxde-base/lxlauncher-gmenu"
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog README
+}
diff --git a/lxde-base/lxlauncher/metadata.xml b/lxde-base/lxlauncher/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxlauncher/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxmenu-data/Manifest b/lxde-base/lxmenu-data/Manifest
new file mode 100644
index 00000000000..fae35d306e9
--- /dev/null
+++ b/lxde-base/lxmenu-data/Manifest
@@ -0,0 +1,2 @@
+DIST lxmenu-data-0.1.2.tar.gz 298734 SHA256 34c285a0430404e815263a4bb33a79eb47b168c56469be0f7ffb19730a57a045 SHA512 8e18d5a0309d69fbd410f8e3e5393f8a49852c2684aa2d2f0c460cf9e1f0fb88810885551d6b3dee1c6270a2a8a8a14973ca5e72b714898d1b6b9b676e3bf922 WHIRLPOOL eee30c0b1051dc3f06bd360035b7a2120d58f258e18c87732620f65f7dcbddf8caf6b4f6646f59f758871ca5b3a5bc29dd2be0f19d9368ee8875a56ed62e0358
+DIST lxmenu-data-0.1.4.tar.xz 179180 SHA256 8802fbc88e4cac80dbf0a2926deb30eeb127c54b93254d7bda591cbe174bfb1c SHA512 2aa8949504e981582b8e94d999a3f3e4876750ee6244d63b585bb0553c5f584401c952682d7eb524ab87dd36f6e22a8b849f5f15559a40f5edfff3d7aa6eb244 WHIRLPOOL 144fca0008e022b2379144f015e7692e806b0f208e172c9facca679aa02162478b9c801b4dcdd3a9cf22209dddfe801db6aa5a160cddf62ea3d9ef0af46ddb39
diff --git a/lxde-base/lxmenu-data/lxmenu-data-0.1.2.ebuild b/lxde-base/lxmenu-data/lxmenu-data-0.1.2.ebuild
new file mode 100644
index 00000000000..5708b97ce55
--- /dev/null
+++ b/lxde-base/lxmenu-data/lxmenu-data-0.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Provides files needed for LXDE application menus"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-devel/gettext
+ >=dev-util/intltool-0.40.0
+ virtual/pkgconfig"
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README
+}
diff --git a/lxde-base/lxmenu-data/lxmenu-data-0.1.4.ebuild b/lxde-base/lxmenu-data/lxmenu-data-0.1.4.ebuild
new file mode 100644
index 00000000000..1595b81ddc8
--- /dev/null
+++ b/lxde-base/lxmenu-data/lxmenu-data-0.1.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Provides files needed for LXDE application menus"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-devel/gettext
+ >=dev-util/intltool-0.40.0
+ virtual/pkgconfig"
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README
+}
diff --git a/lxde-base/lxmenu-data/metadata.xml b/lxde-base/lxmenu-data/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxmenu-data/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest
new file mode 100644
index 00000000000..fb482f7f21b
--- /dev/null
+++ b/lxde-base/lxpanel/Manifest
@@ -0,0 +1,2 @@
+DIST lxpanel-0.7.0.tar.xz 1479456 SHA256 bd010d13b1627335f45be1755f7f260dc439c2cfbce942bc36705fa2cffd0b53 SHA512 396147a24e852dd7288f99281116c797df4dbb1912925a6b4403ffe74bb8e3d821f7cd96965bedb2db9aff2d1ca3ae89be6e5712df04353a69a9cca5b03589aa WHIRLPOOL a5e4394e198b29bffa834b789bf34332e617837f0ebea0ea29bf595100c43aeb7d0a7698bbedb739dc058433462e1df661b41537f49904b77a4e7663360e45af
+DIST lxpanel-0.8.1.tar.xz 1485612 SHA256 c657eb049a0f59e7b2d1ad6cb621c272833b765705c19089e48b3c248351b1e0 SHA512 cebad5e9399618adcc47ad0f2542bd57ce6cd707d65e9f1f67e2a435607e91e948c14102eb5534bb8d60a964277ef98658ec8d7a0109121a4b4f6067b385e39d WHIRLPOOL 8f721f6d81a89f35a2a44e33e0faaca2a1e956d1b826a11f85e3586721238c92a299336c35dcd876d3e98a26691255d9d8118828d5dbd124fd5ffc9367d23629
diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.9-sandbox.patch b/lxde-base/lxpanel/files/lxpanel-0.5.9-sandbox.patch
new file mode 100644
index 00000000000..0f40c185bc6
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.5.9-sandbox.patch
@@ -0,0 +1,29 @@
+Index: lxpanel-0.5.9/src/plugins/Makefile.am
+===================================================================
+--- lxpanel-0.5.9.orig/src/plugins/Makefile.am
++++ lxpanel-0.5.9/src/plugins/Makefile.am
+@@ -49,6 +49,3 @@ EXTRA_DIST = \
+ icon.xpm
+
+ install-exec-hook:
+- rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*.la
+- rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*.a
+- rm -f $(DESTDIR)$(libdir)/lxpanel/plugins/*.
+Index: lxpanel-0.5.9/src/plugins/netstat/Makefile.am
+===================================================================
+--- lxpanel-0.5.9.orig/src/plugins/netstat/Makefile.am
++++ lxpanel-0.5.9/src/plugins/netstat/Makefile.am
+@@ -33,4 +33,3 @@ netstat_la_LDFLAGS = \
+ @LXPANEL_MODULE@
+
+ install-exec-hook:
+- rm -f "$(moduledir)\*.la" *.a
+Index: lxpanel-0.5.9/src/plugins/netstatus/Makefile.am
+===================================================================
+--- lxpanel-0.5.9.orig/src/plugins/netstatus/Makefile.am
++++ lxpanel-0.5.9/src/plugins/netstatus/Makefile.am
+@@ -34,4 +34,3 @@ netstatus_la_LDFLAGS = \
+ $(LXPANEL_MODULE)
+
+ install-exec-hook:
+- rm -f "$(moduledir)\*.la" *.a
diff --git a/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch b/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch
new file mode 100644
index 00000000000..f6325b6f8c3
--- /dev/null
+++ b/lxde-base/lxpanel/files/lxpanel-0.7.0-right-click-fix.patch
@@ -0,0 +1,25 @@
+From d4943c80cded6325284be8b58003fe63dd6e8255 Mon Sep 17 00:00:00 2001
+From: Raimar <no@email.de>
+Date: Thu, 21 Aug 2014 23:21:28 +0200
+Subject: [PATCH 1/1] fix crash after click on empty part of panel
+
+---
+ src/panel.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/panel.c b/src/panel.c
+index 6b2ede6..87903d8 100644
+--- a/src/panel.c
++++ b/src/panel.c
+@@ -233,7 +233,7 @@ static gboolean lxpanel_button_press(GtkWidget *widget, GdkEventButton *event)
+ gtk_menu_popup(popup, NULL, NULL, NULL, NULL, event->button, event->time);
+ return TRUE;
+ }
+- return GTK_WIDGET_CLASS(lxpanel_parent_class)->button_press_event(widget, event);
++ return FALSE;
+ }
+
+ static void lxpanel_class_init(PanelToplevelClass *klass)
+--
+1.7.10.4
+
diff --git a/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild b/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild
new file mode 100644
index 00000000000..22761e2cf7b
--- /dev/null
+++ b/lxde-base/lxpanel/lxpanel-0.7.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools eutils readme.gentoo versionator
+
+MAJOR_VER="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Lightweight X11 desktop panel for LXDE"
+HOMEPAGE="http://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${MAJOR_VER}.x/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE="+alsa wifi"
+RESTRICT="test" # bug 249598
+
+RDEPEND="x11-libs/gtk+:2
+ >=x11-libs/libfm-1.2.0[gtk]
+ x11-libs/libwnck:1
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/libX11
+ lxde-base/lxmenu-data
+ lxde-base/menu-cache
+ alsa? ( media-libs/alsa-lib )
+ wifi? ( net-wireless/wireless-tools )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
+you will have to configure panel settings via its menu.
+This will not be an issue with first time installations."
+
+src_prepare() {
+ #bug #522404
+ epatch "${FILESDIR}"/${PN}-0.7.0-right-click-fix.patch
+ epatch "${FILESDIR}"/${PN}-0.5.9-sandbox.patch
+ #bug #415595
+ sed -i "s:-Werror::" configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ local plugins="netstatus,volume,cpu,deskno,batt, \
+ kbled,xkb,thermal,cpufreq,monitors"
+
+ use wifi && plugins+=",netstat"
+ use alsa && plugins+=",volumealsa"
+ [[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
+
+ econf $(use_enable alsa) --with-x --with-plugins="${plugins}"
+ # the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
+}
+
+src_install () {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog README
+
+ # Get rid of the .la files.
+ find "${D}" -name '*.la' -delete
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/lxde-base/lxpanel/lxpanel-0.8.1.ebuild b/lxde-base/lxpanel/lxpanel-0.8.1.ebuild
new file mode 100644
index 00000000000..9cab2b53429
--- /dev/null
+++ b/lxde-base/lxpanel/lxpanel-0.8.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils readme.gentoo versionator
+
+MAJOR_VER="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Lightweight X11 desktop panel for LXDE"
+HOMEPAGE="http://lxde.org/"
+SRC_URI="mirror://sourceforge/lxde/LXPanel%20%28desktop%20panel%29/LXPanel%20${MAJOR_VER}.x/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE="+alsa wifi"
+RESTRICT="test" # bug 249598
+
+RDEPEND="dev-libs/keybinder:0=
+ x11-libs/gtk+:2
+ >=x11-libs/libfm-1.2.0[gtk]
+ x11-libs/libwnck:1
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/libX11
+ lxde-base/lxmenu-data
+ lxde-base/menu-cache
+ alsa? ( media-libs/alsa-lib )
+ wifi? ( net-wireless/wireless-tools )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+DOC_CONTENTS="If you have problems with broken icons shown in the main panel,
+you will have to configure panel settings via its menu.
+This will not be an issue with first time installations."
+
+src_prepare() {
+ #bug #415595
+ sed -i "s:-Werror::" configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ local plugins="netstatus,volume,cpu,deskno,batt, \
+ kbled,xkb,thermal,cpufreq,monitors"
+
+ use wifi && plugins+=",netstat"
+ use alsa && plugins+=",volumealsa"
+ [[ ${CHOST} == *-interix* ]] && plugins=deskno,kbled,xkb
+
+ econf $(use_enable alsa) --with-x --with-plugins="${plugins}"
+ # the gtk+ dep already pulls in libX11, so we might as well hardcode with-x
+}
+
+src_install () {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog README
+
+ # Get rid of the .la files.
+ find "${D}" -name '*.la' -delete
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/lxde-base/lxpanel/metadata.xml b/lxde-base/lxpanel/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxpanel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxpolkit/Manifest b/lxde-base/lxpolkit/Manifest
new file mode 100644
index 00000000000..73a8f836e79
--- /dev/null
+++ b/lxde-base/lxpolkit/Manifest
@@ -0,0 +1 @@
+DIST lxpolkit-0.1.0.tar.gz 204579 SHA256 511affca8f55adc67031fb3627b9889064c685e4b983737d8deecdf4f94f008b
diff --git a/lxde-base/lxpolkit/lxpolkit-0.1.0-r1.ebuild b/lxde-base/lxpolkit/lxpolkit-0.1.0-r1.ebuild
new file mode 100644
index 00000000000..181102977e3
--- /dev/null
+++ b/lxde-base/lxpolkit/lxpolkit-0.1.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A simple PolicyKit authentication agent"
+HOMEPAGE="http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxpolkit;a=summary http://blog.lxde.org/?p=674"
+SRC_URI="mirror://sourceforge/project/lxde/LXPolkit/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=sys-auth/polkit-0.102
+ x11-libs/gtk+:3
+ !gnome-extra/polkit-gnome"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40.0
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+src_prepare() {
+ local f=data/lxpolkit.desktop.in.in
+ sed -i -e '/^NotShowIn/s:=.*:=KDE;:' ${f} || die
+ echo 'AutostartCondition=GNOME3 if-session gnome-fallback' >> ${f}
+}
+
+src_configure() { econf --enable-gtk3; }
diff --git a/lxde-base/lxpolkit/lxpolkit-0.1.0-r2.ebuild b/lxde-base/lxpolkit/lxpolkit-0.1.0-r2.ebuild
new file mode 100644
index 00000000000..9cfdbcdd8e3
--- /dev/null
+++ b/lxde-base/lxpolkit/lxpolkit-0.1.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A simple PolicyKit authentication agent"
+HOMEPAGE="http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxpolkit;a=summary http://blog.lxde.org/?p=674"
+SRC_URI="mirror://sourceforge/project/lxde/LXPolkit/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-auth/polkit-0.102
+ x11-libs/gtk+:3
+ !gnome-extra/polkit-gnome"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40.0
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_prepare() {
+ local f=data/lxpolkit.desktop.in.in
+ sed -i -e '/^NotShowIn/s:=.*:=MATE;KDE;:' ${f} || die
+ echo 'AutostartCondition=GNOME3 if-session gnome-fallback' >> ${f}
+}
+
+src_configure() { econf --enable-gtk3; }
diff --git a/lxde-base/lxpolkit/metadata.xml b/lxde-base/lxpolkit/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxpolkit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxrandr/Manifest b/lxde-base/lxrandr/Manifest
new file mode 100644
index 00000000000..9f55f855b8b
--- /dev/null
+++ b/lxde-base/lxrandr/Manifest
@@ -0,0 +1 @@
+DIST lxrandr-0.1.2.tar.gz 230394 SHA256 fb8139478f6cfeac6a2d8adb4e55e8cad099bfe2da7c82253c935ba719f9cf19 SHA512 a2131706b1f6febea3cb12758403650700a29ad1fe036caf5ecf962264f6f8180fdef392f88a77071b3d218ea2f08b0a1f66e4d58db6c2c55125d475bdee256a WHIRLPOOL 067a0dc3a92a698b1da052214620cb41c7fbaeaed40f5f70cff122f36438140f03af226e5aa2359c63a366ec284b7c03b81621d5b414197ef55cd16dc3406961
diff --git a/lxde-base/lxrandr/lxrandr-0.1.2.ebuild b/lxde-base/lxrandr/lxrandr-0.1.2.ebuild
new file mode 100644
index 00000000000..e126048440b
--- /dev/null
+++ b/lxde-base/lxrandr/lxrandr-0.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="LXDE GUI interface to RandR extention"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ x11-libs/libXrandr
+ x11-apps/xrandr"
+DEPEND="${RDEPEND}
+ x11-proto/randrproto
+ virtual/pkgconfig
+ sys-devel/gettext
+ >=dev-util/intltool-0.40.0"
+
+src_install () {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS
+}
diff --git a/lxde-base/lxrandr/metadata.xml b/lxde-base/lxrandr/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxrandr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxsession-edit/Manifest b/lxde-base/lxsession-edit/Manifest
new file mode 100644
index 00000000000..68c6cbdfadd
--- /dev/null
+++ b/lxde-base/lxsession-edit/Manifest
@@ -0,0 +1 @@
+DIST lxsession-edit-0.2.0.tar.gz 224146 SHA256 558088aa8e0219a71a003fc0a66941cc828635615873b043e4ad239fc0889c5e SHA512 6bf039322738502ec92e2d600d98142dafff7caa3e4a45f132cc7f4460985df2351b38fdf57ea214c49311d1b4fd96b79086936fade44fb0316dd013c417ba9f WHIRLPOOL 8e07d6e9abec28297a55d9d97d6bb5c6761f4c40a648e43c2d61451d60f3e5ed13cd29ca2be0b592660bd5a4a8b8e3b3f2f1386689b52e7f0d6390e2eccce135
diff --git a/lxde-base/lxsession-edit/lxsession-edit-0.2.0.ebuild b/lxde-base/lxsession-edit/lxsession-edit-0.2.0.ebuild
new file mode 100644
index 00000000000..4d45421eb06
--- /dev/null
+++ b/lxde-base/lxsession-edit/lxsession-edit-0.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="LXDE session autostart editor"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~arm-linux ~x86-linux"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/glib:2
+ x11-libs/gtk+:2"
+RDEPEND="${COMMON_DEPEND}
+ lxde-base/lxde-common
+ lxde-base/lxsession"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+ dev-util/intltool
+ virtual/pkgconfig"
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README
+}
diff --git a/lxde-base/lxsession-edit/metadata.xml b/lxde-base/lxsession-edit/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxsession-edit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
new file mode 100644
index 00000000000..15760293916
--- /dev/null
+++ b/lxde-base/lxsession/Manifest
@@ -0,0 +1,2 @@
+DIST lxsession-0.4.6.1.tar.gz 407100 SHA256 bd6a7ef3c0ba4b9eedf3c58624dbce8bbbba3b179abbc552bf10c2830eec3ee1 SHA512 eea554ba70b3fd278b7ce0bb2d278241dff26eaccf74f2a4a0a9846515688fd5dd846c97f29c71139a0c3b95bc5e906efc4673f0cd79d8db427894dff5524f16 WHIRLPOOL 235d6c2e8a622a4460d767d5b6af22710f17060fffea18ac5cedaeb4dc9f70dc77872d486caa9d7256c379f160755ac7b8299e7836fd513675b65d1c979b900a
+DIST lxsession-0.4.9.2.tar.gz 745637 SHA256 eff03e573b561cabe81c5d015d825e3d998e98d6621040113d7df471c8b9cfb4 SHA512 cffcd15faab79ad165f969edf65b6b106c5b4405b78e6c102a74ab96da9cf61b781d0be7587849ce56672ae3015e8f63bc1b84465f5ec0084c299ec588992172 WHIRLPOOL 5a5c172cda30a4690d82a4a8acd3b983cbcc60ed71fefdfbfbb97e8b4363f4c26825267a0bd45c71589c2dd180f9699a2d05dd759fe23bcfdd5e9d3a10ccdda2
diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch
new file mode 100644
index 00000000000..36c7c5fabe4
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-configure.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 66d041c..4d8a370 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@
+ AC_INIT([lxsession],[0.4.9.2],[],[lxsession])
+
+ # Autotols programs
+-AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror foreign])
++AM_INIT_AUTOMAKE([1.11.1 -Wall -Werror foreign subdir-objects])
+ AC_PREREQ([2.69])
+ IT_PROG_INTLTOOL([0.40.0],[no-xml])
+
diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch
new file mode 100644
index 00000000000..91d15836241
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch
@@ -0,0 +1,111 @@
+Taken from:
+http://svnweb.mageia.org/packages/cauldron/lxsession/current/SOURCES/lxsession-0.4.9.2-fix-logind-dbus-calls.patch?revision=549605&view=co&pathrev=549606
+
+--- lxsession-0.4.9.2/lxsession-logout/dbus-interface.c.0000 2013-04-12 22:02:19.000000000 +0100
++++ lxsession-0.4.9.2/lxsession-logout/dbus-interface.c 2013-11-05 11:00:34.038965063 +0000
+@@ -244,10 +244,11 @@
+ return function_result;
+ }
+
+-static void
+-logind_call_function (const gchar *function, gboolean value, GError **error)
++static char *
++logind_call_function (const gchar *function)
+ {
+ GVariant *result;
++ GError *err = NULL;
+
+ if (!logind_proxy)
+ {
+@@ -258,20 +259,28 @@
+ "/org/freedesktop/login1",
+ "org.freedesktop.login1.Manager",
+ NULL,
+- error);
++ &err);
++ if (err != NULL)
++ g_error_free(err);
+ if (!logind_proxy)
+- return;
++ return NULL;
+ }
+
+ result = g_dbus_proxy_call_sync (logind_proxy,
+ function,
+- g_variant_new ("(b)", value),
++ g_variant_new ("(b)", TRUE),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+- error);
+- g_variant_unref (result);
+- return;
++ &err);
++ if (result)
++ g_variant_unref (result);
++ if (err != NULL) {
++ char *r = strdup(err->message);
++ g_error_free(err);
++ return r;
++ }
++ return NULL;
+ }
+
+ gboolean
+@@ -280,10 +289,10 @@
+ return logind_query ("CanPowerOff", FALSE, NULL);
+ }
+
+-void
+-dbus_logind_PowerOff (GError **error)
++char *
++dbus_logind_PowerOff (void)
+ {
+- logind_call_function ("PowerOff", TRUE, error);
++ return logind_call_function ("PowerOff");
+ }
+
+ gboolean
+@@ -292,10 +301,10 @@
+ return logind_query ("CanReboot", FALSE, NULL);
+ }
+
+-void
+-dbus_logind_Reboot (GError **error)
++char *
++dbus_logind_Reboot (void)
+ {
+- logind_call_function ("Reboot", TRUE, error);
++ return logind_call_function ("Reboot");
+ }
+
+ gboolean
+@@ -304,10 +313,10 @@
+ return logind_query ("CanSuspend", FALSE, NULL);
+ }
+
+-void
+-dbus_logind_Suspend (GError **error)
++char *
++dbus_logind_Suspend (void)
+ {
+- logind_call_function ("Suspend", TRUE, error);
++ return logind_call_function ("Suspend");
+ }
+
+ gboolean
+@@ -316,10 +325,10 @@
+ return logind_query ("CanHibernate", FALSE, NULL);
+ }
+
+-void
+-dbus_logind_Hibernate (GError **error)
++char *
++dbus_logind_Hibernate (void)
+ {
+- logind_call_function ("Hibernate", TRUE, error);
++ return logind_call_function ("Hibernate");
+ }
+
+ /*** ConsoleKit mechanism ***/
+
diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch
new file mode 100644
index 00000000000..8a51f0300be
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-makefile.patch
@@ -0,0 +1,13 @@
+# upstream issue: https://sourceforge.net/tracker/?func=detail&aid=3615092&group_id=180858&atid=894869
+
+--- a/lxsession-edit/Makefile.am 2012-10-25 14:20:04.000000000 -0400
++++ b/lxsession-edit/Makefile.am 2013-10-14 21:30:56.627684026 -0400
+@@ -5,7 +5,7 @@
+ bin_PROGRAMS = lxsession-edit
+
+ lxsession_edit_CFLAGS = \
+- -I$(topsrcdir) \
++ -I$(top_srcdir) \
+ $(GTK_CFLAGS) \
+ $(ADDITIONAL_FLAGS) \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
diff --git a/lxde-base/lxsession/lxsession-0.4.6.1.ebuild b/lxde-base/lxsession/lxsession-0.4.6.1.ebuild
new file mode 100644
index 00000000000..e0a8c377766
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="LXDE session manager (lite version)"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~arm-linux ~x86-linux"
+SLOT="0"
+# upower USE flag is enabled by default in the desktop profile
+IUSE="+dbus nls upower"
+
+COMMON_DEPEND="dev-libs/glib:2
+ lxde-base/lxde-common
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ dbus? ( sys-apps/dbus )"
+RDEPEND="${COMMON_DEPEND}
+ upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xproto"
+REQUIRED_USE="upower? ( dbus )"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_configure() {
+ # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+ econf \
+ $(use_enable dbus) \
+ $(use_enable nls)
+}
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild
new file mode 100644
index 00000000000..f66bfcbbf62
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.14"
+VALA_MAX_API_VERSION="0.20"
+
+inherit vala autotools eutils
+
+DESCRIPTION="LXDE session manager (lite version)"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux"
+SLOT="0"
+# upower USE flag is enabled by default in the desktop profile
+IUSE="nls upower"
+
+COMMON_DEPEND="dev-libs/glib:2
+ dev-libs/libgee:0
+ dev-libs/dbus-glib
+ lxde-base/lxde-common
+ sys-auth/polkit
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ sys-apps/dbus"
+RDEPEND="${COMMON_DEPEND}
+ !lxde-base/lxsession-edit
+ sys-apps/lsb-release
+ upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${COMMON_DEPEND}
+ $(vala_depend)
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+ # bug #488082
+ epatch "${FILESDIR}"/${P}-makefile.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+ econf \
+ $(use_enable nls)
+}
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild
new file mode 100644
index 00000000000..a9811c9e432
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.14"
+VALA_MAX_API_VERSION="0.22"
+
+inherit vala autotools eutils
+
+DESCRIPTION="LXDE session manager (lite version)"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux"
+SLOT="0"
+# upower USE flag is enabled by default in the desktop profile
+IUSE="nls upower"
+
+COMMON_DEPEND="dev-libs/glib:2
+ dev-libs/libgee:0
+ dev-libs/dbus-glib
+ lxde-base/lxde-common
+ sys-auth/polkit
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ sys-apps/dbus"
+RDEPEND="${COMMON_DEPEND}
+ !lxde-base/lxsession-edit
+ sys-apps/lsb-release
+ upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${COMMON_DEPEND}
+ $(vala_depend)
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+ # bug #488082
+ epatch "${FILESDIR}"/${P}-makefile.patch
+
+ # bug #497100
+ epatch "${FILESDIR}"/${P}-configure.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+ econf \
+ $(use_enable nls)
+}
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
new file mode 100644
index 00000000000..27270a0ad8d
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.14"
+VALA_MAX_API_VERSION="0.22"
+
+inherit vala autotools eutils
+
+DESCRIPTION="LXDE session manager (lite version)"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux"
+SLOT="0"
+# upower USE flag is enabled by default in the desktop profile
+IUSE="nls upower"
+
+COMMON_DEPEND="dev-libs/glib:2
+ dev-libs/libgee:0
+ dev-libs/dbus-glib
+ lxde-base/lxde-common
+ sys-auth/polkit
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ sys-apps/dbus"
+RDEPEND="${COMMON_DEPEND}
+ !lxde-base/lxsession-edit
+ sys-apps/lsb-release
+ upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${COMMON_DEPEND}
+ $(vala_depend)
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+ # bug #488082
+ epatch "${FILESDIR}"/${P}-makefile.patch
+
+ # bug #497100
+ epatch "${FILESDIR}"/${P}-configure.patch
+
+ # bug #496880
+ epatch "${FILESDIR}"/${P}-fix-logind-dbus-calls.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+ econf \
+ $(use_enable nls)
+}
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2.ebuild
new file mode 100644
index 00000000000..b58c3ab3be1
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.9.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.14"
+VALA_MAX_API_VERSION="0.20"
+
+inherit vala autotools eutils
+
+DESCRIPTION="LXDE session manager (lite version)"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux"
+SLOT="0"
+# upower USE flag is enabled by default in the desktop profile
+IUSE="nls upower"
+
+COMMON_DEPEND="dev-libs/glib:2
+ dev-libs/libgee:0
+ dev-libs/dbus-glib
+ lxde-base/lxde-common
+ sys-auth/polkit
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ sys-apps/dbus"
+RDEPEND="${COMMON_DEPEND}
+ !lxde-base/lxsession-edit
+ upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
+DEPEND="${COMMON_DEPEND}
+ $(vala_depend)
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+ # bug #488082
+ epatch "${FILESDIR}"/${P}-makefile.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+ econf \
+ $(use_enable nls)
+}
diff --git a/lxde-base/lxsession/metadata.xml b/lxde-base/lxsession/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxsession/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxshortcut/Manifest b/lxde-base/lxshortcut/Manifest
new file mode 100644
index 00000000000..2925982b8a6
--- /dev/null
+++ b/lxde-base/lxshortcut/Manifest
@@ -0,0 +1 @@
+DIST lxshortcut-0.1.2.tar.gz 224223 SHA256 8097f2522657374162a4e5e3c58898fe0c367e307b0ff4c50848b6b0323409fe SHA512 0567c0ee77dbe7ea5f7d23e3ec2d3ba68f458bc9d8e4e5c8764bb53963eecf07d69dee2617f695b8d86dcb71916864c4e01dab12bd4b73db5366aebe24867e0c WHIRLPOOL 26b3240420fe182e9b77f6c86cbfb43b9e63b4cb053cec95aeefaef91d81d0db018540385b3331b8084675b70bf7215f7577bc65318943e68191a09220cda2d6
diff --git a/lxde-base/lxshortcut/lxshortcut-0.1.2.ebuild b/lxde-base/lxshortcut/lxshortcut-0.1.2.ebuild
new file mode 100644
index 00000000000..716473e3c52
--- /dev/null
+++ b/lxde-base/lxshortcut/lxshortcut-0.1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="LXDE tool to edit desktop entry files"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ dev-libs/glib:2"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ dev-util/intltool
+ virtual/pkgconfig"
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ChangeLog README
+}
diff --git a/lxde-base/lxshortcut/metadata.xml b/lxde-base/lxshortcut/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxshortcut/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxtask/Manifest b/lxde-base/lxtask/Manifest
new file mode 100644
index 00000000000..584bcc38820
--- /dev/null
+++ b/lxde-base/lxtask/Manifest
@@ -0,0 +1,3 @@
+DIST lxtask-0.1.4.tar.gz 241034 SHA256 39110c99e9e56101e25be35628abafd81b1e3ea47e2d8bea45b2cb12c1e3cd61 SHA512 60a9b55880ee0a5b86043edacefb93b83caddbb045e781537b6fd04d2e3259e4fa5117fc84c7f0ca0dd914d9e14b602a9ab0022a74d9b634b72fdf4f950189c5 WHIRLPOOL 7f4b1c8aab45de3e7e6c62b11907db678ab7cbb246d345cfad229e99ef32304b04c47f277988857326e0f8cc7aa986ef144b7540a4bd4ed4b18f4f3298bc3a8a
+DIST lxtask-0.1.5.tar.xz 135600 SHA256 07dd2cc9aa80d161cfbc223c9187da145cc472b067f429734675bf018e95f265 SHA512 3868a933746117b5c71b23d06a16e894bfe4b365308005f7a2f730b692e4cc8484bfd8bcba6b88a765f007477c1a4607834459c6fdb601e9d1ba12ca26fb5e5b WHIRLPOOL 1fc0b5267acae1311802ad76dd9aef339620c80ad5761777f9cc72606674d20274f1bcfb509498429b6308acf1d9124c2d5f43beaaf33a6557b23a59942ed283
+DIST lxtask-0.1.6.tar.xz 135480 SHA256 f78d6a9953dfbedfa00f69b3e908e326398cd40f541bc8a6a08f5f0a06894345 SHA512 e3c139cea8260b1f1af9c3fb524beefedaac440eef6bc1efdeac73ecdbe4d44dcd277160e64306b681ddbd9eb0f5bc5077957a492f7a06ffcd0c844aad88f827 WHIRLPOOL 9aa64ea0b6d6bc108cfa18f5b3dd7c2bb63ac48287a00a8825e715ce2fb90e6058e06187456397759b71fc2e0969ef4863b9b005e2d39659abe1c674c48dcd3e
diff --git a/lxde-base/lxtask/files/lxtask-0.1.4-remove-broken-linguas.patch b/lxde-base/lxtask/files/lxtask-0.1.4-remove-broken-linguas.patch
new file mode 100644
index 00000000000..71bf5457730
--- /dev/null
+++ b/lxde-base/lxtask/files/lxtask-0.1.4-remove-broken-linguas.patch
@@ -0,0 +1,13 @@
+Index: lxtask-0.1.4/configure.ac
+===================================================================
+--- lxtask-0.1.4.orig/configure.ac
++++ lxtask-0.1.4/configure.ac
+@@ -44,7 +44,7 @@ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
+
+ #These codes are NOT maintained by Pootle ca el en_GB lv sq
+-ALL_LINGUAS="af ar ca cs da de el en_GB es et eu fa fi fr gl hr hu id it ja ko lt lv ml nb nl nn pl ps pt pt_BR ru sk sl sq sv tr uk ur ur_PK vi zh_CN zh_TW"
++ALL_LINGUAS="af ar ca cs da de el es et eu fa fi fr gl hr hu id it ja ko lt ml nb nl nn pl ps pt pt_BR ru sk sl sv tr uk ur ur_PK vi zh_CN zh_TW"
+ AM_GLIB_GNU_GETTEXT
+
+ AC_OUTPUT([
diff --git a/lxde-base/lxtask/files/lxtask-0.1.4-sandbox.patch b/lxde-base/lxtask/files/lxtask-0.1.4-sandbox.patch
new file mode 100644
index 00000000000..98f0bddea28
--- /dev/null
+++ b/lxde-base/lxtask/files/lxtask-0.1.4-sandbox.patch
@@ -0,0 +1,21 @@
+diff -ua a/configure.ac b/configure.ac
+--- a/configure.ac 2013-09-19 15:10:33.339982117 -0700
++++ b/configure.ac 2013-09-19 15:12:09.759981997 -0700
+@@ -6,6 +6,8 @@
+
+ AM_CONFIG_HEADER(config.h)
+
++AC_CONFIG_MACRO_DIR([m4])
++
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AM_PROG_CC_C_O
+diff -ua a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2013-09-19 15:10:45.569982101 -0700
++++ b/Makefile.am 2013-09-19 15:12:19.639981985 -0700
+@@ -1,3 +1,5 @@
++ACLOCAL_AMFLAGS= -I m4
++
+ SUBDIRS = po src
+
+ desktopdir = $(datadir)/applications
diff --git a/lxde-base/lxtask/lxtask-0.1.4-r1.ebuild b/lxde-base/lxtask/lxtask-0.1.4-r1.ebuild
new file mode 100644
index 00000000000..c2cab7b6fd5
--- /dev/null
+++ b/lxde-base/lxtask/lxtask-0.1.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="LXDE Task manager"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ dev-libs/glib:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ >=dev-util/intltool-0.40.0"
+
+src_prepare() {
+ # use new patch to remove broken linguas
+ epatch "${FILESDIR}"/${P}-remove-broken-linguas.patch
+
+ # bug #485348
+ epatch "${FILESDIR}"/${P}-sandbox.patch
+
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+ eautoreconf
+}
+
+src_install () {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README ChangeLog
+}
diff --git a/lxde-base/lxtask/lxtask-0.1.4.ebuild b/lxde-base/lxtask/lxtask-0.1.4.ebuild
new file mode 100644
index 00000000000..d2e806714bf
--- /dev/null
+++ b/lxde-base/lxtask/lxtask-0.1.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="LXDE Task manager"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ dev-libs/glib:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ >=dev-util/intltool-0.40.0"
+
+src_prepare() {
+ # use new patch to remove broken linguas
+ epatch "${FILESDIR}"/${P}-remove-broken-linguas.patch
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+ eautoreconf
+}
+
+src_install () {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README
+}
diff --git a/lxde-base/lxtask/lxtask-0.1.5.ebuild b/lxde-base/lxtask/lxtask-0.1.5.ebuild
new file mode 100644
index 00000000000..69b9a37a418
--- /dev/null
+++ b/lxde-base/lxtask/lxtask-0.1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="LXDE Task manager"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ dev-libs/glib:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ >=dev-util/intltool-0.40.0"
+
+src_install () {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README
+}
diff --git a/lxde-base/lxtask/lxtask-0.1.6.ebuild b/lxde-base/lxtask/lxtask-0.1.6.ebuild
new file mode 100644
index 00000000000..71e30252852
--- /dev/null
+++ b/lxde-base/lxtask/lxtask-0.1.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="LXDE Task manager"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm ppc x86 ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ dev-libs/glib:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ >=dev-util/intltool-0.40.0"
+
+src_install () {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README
+}
diff --git a/lxde-base/lxtask/metadata.xml b/lxde-base/lxtask/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxtask/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/lxterminal/Manifest b/lxde-base/lxterminal/Manifest
new file mode 100644
index 00000000000..31de416da3b
--- /dev/null
+++ b/lxde-base/lxterminal/Manifest
@@ -0,0 +1,2 @@
+DIST lxterminal-0.1.11.tar.gz 304025 SHA256 f495166b308a96e8c30c8892b33ab163f3865253a9bbd4bdac462f974fda7253 SHA512 4f929e9177775c78dcf4c440e1cff4f4824f56ff5bd165cb76ab42208db350feeb08d22449a482b3979160873b0120a78ace43069d910b5aeeec0736aa550139 WHIRLPOOL 691d277037d22d599fe1abdb234c73adb239652f8dd00d4ee02961fd62719f37098f8f2a5504f01347a2fbbec81d981399d4261d19f3f1a55e71afa7255f546e
+DIST lxterminal-0.2.0.tar.gz 248698 SHA256 174b0e99652f72acd7a98b6ff1b75eba1a9bf364996e6f118cccdaba0d282baf SHA512 5bec0e16fa4d929203e4c206fb59fb0c88e02f29adbf527c31fa2a0007d3dddbdf12f2219e204360b5dd95a68a89410fcf937325f3a7eb1229b568c9c10c0e78 WHIRLPOOL f7315724273915ab4ec21b6aaf569545bb0c4ab63802db26b75bc7a7b835d87b283a339d2ece93a53c8c3ae6a032b494590d3a41a5264cd4d6a643f124f71dde
diff --git a/lxde-base/lxterminal/lxterminal-0.1.11.ebuild b/lxde-base/lxterminal/lxterminal-0.1.11.ebuild
new file mode 100644
index 00000000000..978224ec0fc
--- /dev/null
+++ b/lxde-base/lxterminal/lxterminal-0.1.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ dev-libs/glib:2
+ x11-libs/vte:0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ >=dev-util/intltool-0.40.0"
+
+src_install () {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README
+}
diff --git a/lxde-base/lxterminal/lxterminal-0.2.0.ebuild b/lxde-base/lxterminal/lxterminal-0.2.0.ebuild
new file mode 100644
index 00000000000..83a43a19357
--- /dev/null
+++ b/lxde-base/lxterminal/lxterminal-0.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Lightweight vte-based tabbed terminal emulator for LXDE"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+SLOT="0"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ dev-libs/glib:2
+ x11-libs/vte:0"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ >=dev-util/intltool-0.40.0"
+
+src_install () {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README
+}
diff --git a/lxde-base/lxterminal/metadata.xml b/lxde-base/lxterminal/metadata.xml
new file mode 100644
index 00000000000..831327e101a
--- /dev/null
+++ b/lxde-base/lxterminal/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/menu-cache/Manifest b/lxde-base/menu-cache/Manifest
new file mode 100644
index 00000000000..90274ed779e
--- /dev/null
+++ b/lxde-base/menu-cache/Manifest
@@ -0,0 +1,4 @@
+DIST menu-cache-0.3.3.tar.gz 392291 SHA256 07241c1f5f371b426d3b0a6e571a86184ec6256bdd7ead7a4da866cd10f25955 SHA512 1966b94989cdae0a1a3a48f19d337471a28acadecf7f03dac8c27d515324b8eb4d15102e2aa293c251e020f521f6e586aa13c8eca7ae7909b9ce5e67ef3ebafe WHIRLPOOL 68cec171fcf87be051a661017166def0f4441be25edeb0af56a9813f49fb3ee906b5ef10557ac5ebdb3d5f63696e4718ae22ba8af5a9c01f365de3823d10420c
+DIST menu-cache-0.4.1.tar.gz 412859 SHA256 4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e SHA512 9744765f6894462139cbb9cbeec74c915df27bfeb31179743fc6dbf2ac20e26520be6d089c8733f0a17248a2aa6687730c5ee28f26eb15195eaa16db5c73aec6 WHIRLPOOL 8d797f12bd97333962f911893e3fc3b43b417c68155e96fbd1a0952dcd43a847bc3594c12ddd5d69bab6cf692585f2ab84a1545c53e2e62c3d9de2686653e198
+DIST menu-cache-0.5.1.tar.gz 406329 SHA256 08e658021faecd4eefb26cc21b207251a6b4e844e131cec491471aba9eaea122 SHA512 44d55a01f5452804e77518c4a2ba400a5b65edbf4061e346a6c02356195867eaa0bb9eaa057fbf603ddf79759acb16632bf3b7ae543eebc1544e28517cd23066 WHIRLPOOL c216ade53bfe9cb15c37e2cefc1154eea2e406c766600789f5b265922de2f0dfd0bbdd4d6d53d9c84a4e80da6d82d46e13fd6d53b381dd180f2fd604219fd7fd
+DIST menu-cache-1.0.0.tar.xz 261988 SHA256 ff7df437bbfd3119c5f662c6d209b98f15de03a7203308c6b56a4c1e1d419aaf SHA512 b336cddb9c3d993aa605e6adf9ac3c40fe631eccfa06d1835897f6cb5ae82bed93bc323c12b7dff44b8785dfb646058d77cb697f3c275998a5483b2582926e22 WHIRLPOOL 8ba4c904d8ac6046ff38904a37d56dbb1cdac54ee47ae1a63cd9dfc0cf2a19a3764feeaaef168fbf47c22b26cdf948d9b68d7287674faf49487424361a5bc90a
diff --git a/lxde-base/menu-cache/menu-cache-0.3.3.ebuild b/lxde-base/menu-cache/menu-cache-0.3.3.ebuild
new file mode 100644
index 00000000000..e412a30b1a4
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-0.3.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="A library creating and utilizing caches to speed up freedesktop.org application menus"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
diff --git a/lxde-base/menu-cache/menu-cache-0.4.1.ebuild b/lxde-base/menu-cache/menu-cache-0.4.1.ebuild
new file mode 100644
index 00000000000..8b17a916e07
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-0.4.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="A library creating and utilizing caches to speed up freedesktop.org application menus"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+# ABI is v2. See Makefile.am
+SLOT="0/2"
+KEYWORDS="~alpha amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
diff --git a/lxde-base/menu-cache/menu-cache-0.5.1.ebuild b/lxde-base/menu-cache/menu-cache-0.5.1.ebuild
new file mode 100644
index 00000000000..9c0e413f5ee
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-0.5.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="A library creating and utilizing caches to speed up freedesktop.org application menus"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+# ABI is v2. See Makefile.am
+SLOT="0/2"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
diff --git a/lxde-base/menu-cache/menu-cache-1.0.0-r1.ebuild b/lxde-base/menu-cache/menu-cache-1.0.0-r1.ebuild
new file mode 100644
index 00000000000..cfb608c81b1
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.0.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="A library creating and utilizing caches to speed up freedesktop.org application menus"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+# ABI is v2. See Makefile.am
+SLOT="0/2"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/libfm-extra"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
diff --git a/lxde-base/menu-cache/menu-cache-1.0.0.ebuild b/lxde-base/menu-cache/menu-cache-1.0.0.ebuild
new file mode 100644
index 00000000000..3afedb30e3b
--- /dev/null
+++ b/lxde-base/menu-cache/menu-cache-1.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="A library creating and utilizing caches to speed up freedesktop.org application menus"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+# ABI is v2. See Makefile.am
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/libfm"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
diff --git a/lxde-base/menu-cache/metadata.xml b/lxde-base/menu-cache/metadata.xml
new file mode 100644
index 00000000000..bac59be2e08
--- /dev/null
+++ b/lxde-base/menu-cache/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <herd>lxqt</herd>
+ <upstream>
+ <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/lxde-base/metadata.xml b/lxde-base/metadata.xml
new file mode 100644
index 00000000000..b5845ecb9e4
--- /dev/null
+++ b/lxde-base/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The lxde-base category contains core packages for LXDE,
+ the Lightweight X11 Desktop Environment.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría lxde-base contiene paquetes vitales para LXDE, el
+ entorno de escritorio ligero X11.
+ </longdescription>
+</catmetadata>