ldm: Added autotools inherit.

6 files changed, 11 insertions, 58 deletions

diff --git a/x11-misc/ldm/ChangeLog b/x11-misc/ldm/ChangeLog
index 812de76..cc4e7ae 100644
--- a/x11-misc/ldm/ChangeLog
+++ b/x11-misc/ldm/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 12 2011; Wim Muskee wimmuskee@gmail.com ldm-9999.ebuild:
+  Added autotools inherit.
+
+  17 12 2011; Wim Muskee wimmuskee@gmail.com ldm-2.2.4.ebuild:
+  Added autotools inherit.
+
   18 11 2011; Wim Muskee wimmuskee@gmail.com ldm-2.2.4.ebuild:
   Stable for x86.
 
diff --git a/x11-misc/ldm/Manifest b/x11-misc/ldm/Manifest
index 5b420f5..be1a0b2 100644
--- a/x11-misc/ldm/Manifest
+++ b/x11-misc/ldm/Manifest
@@ -1,6 +1,4 @@
-AUX ldm-2.2.3-python3.patch 509 RMD160 aaf152c8fdce2ecb3b640fc6283b32d5de2a1d29 SHA1 02287f2e257ee59e9316920b19e06d3f14559559 SHA256 38c59b476b7c793478326bc00cbeec8b236b2da7f6f84601cf728ae978387d94
-EBUILD ldm-2.2.3-r1.ebuild 821 RMD160 f7738f545be673f4a84fbdf2ab47c78cb984c5d0 SHA1 2618b26e78921c9c06fb4c6de5801f048e72dca0 SHA256 14e6af9e53dce20931a13fc0636b5efa37a56ce83fade0e2d687f5af1057382b
-EBUILD ldm-2.2.4.ebuild 772 RMD160 16d2dd84ac2d52f48c37b82779a1b3c18889b229 SHA1 e0dafa2906298b343759764d17e1eb5ede414a0c SHA256 b51651c2ee20d64599569dba480b9109033d85354b7183dc529966c6a6040553
-EBUILD ldm-9999.ebuild 755 RMD160 9f04272a65a3c50ddb9a621b2344659558717b89 SHA1 0c29d7d32a02027cdfaf8bd5d87b14e077f36d38 SHA256 fa479bd6fa5dd9a51849d4b3d4e419d31552d5d5f880b2bcc2cf9c57028b19b5
-MISC ChangeLog 1892 RMD160 bf9cd10fe3b0437d7841b17a82695e6a40847a76 SHA1 cd2d98f60b5602d960ae95c5cc246b2a1eb9e264 SHA256 2c9e89f32cafabd263c150a9e8f8ee3100851d4230267393b39e3ee6714b9399
+EBUILD ldm-2.2.4.ebuild 782 RMD160 0431f26bc46848814e7ea5151039a7237b6ab7ba SHA1 7bbd27f42b2b046646112cd8ddfb48d0eb2056e2 SHA256 e77d97c793102f12a68b89698a513f4fb0203e9463a4079c76ec63cbe4ecfba1
+EBUILD ldm-9999.ebuild 765 RMD160 349e3747ef808072043be0952dfd769dbdeb35a3 SHA1 66303f783f7dd17b94b2b22a3af81a1fac8796fa SHA256 5ce92d8245d4ede4d4e7bb258c49ad6483e7f1589f3fc8bdb5788424ee2abb84
+MISC ChangeLog 2073 RMD160 746a8e0990b7d89dd4a57b7304b2551b5083a394 SHA1 9e1e22551a3db28756a6921ddd43d8a0b445dadb SHA256 1b98be4f7aeebef7b8bc147e1f0dda08584d7f8ac355802aa04315f55161663c
 MISC metadata.xml 239 RMD160 5c09d64ce69a1c3ead8110ab2cc4242f4b79d361 SHA1 3569156a75f6a3e70bf78fec27420754f42f709c SHA256 81174591b128a73f77bd663c79dc842ce8df791b8b1b498d99c3aa1116a80a40
diff --git a/x11-misc/ldm/files/ldm-2.2.3-python3.patch b/x11-misc/ldm/files/ldm-2.2.3-python3.patch
deleted file mode 100644
index 99ed9a3..0000000
--- a/x11-misc/ldm/files/ldm-2.2.3-python3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- generate_locale_list.py.orig	2011-06-21 06:07:17.000000000 +0200
-+++ generate_locale_list.py	2011-06-21 06:08:28.000000000 +0200
-@@ -59,7 +59,8 @@
-         cmd = ["cat",  "/usr/share/i18n/SUPPORTED"]
-     else:
-         cmd = ["locale",  "-a"]
--    for thing in Popen(cmd, stdout=PIPE).communicate()[0].split("\n"):
-+    for thing in Popen(cmd, stdout=PIPE).stdout.readlines():
-+        thing=str(thing.decode("utf-8").strip())
-         myarr.append(thing.split(".")[0].split(" ")[0])
-     return myarr
- 
diff --git a/x11-misc/ldm/ldm-2.2.3-r1.ebuild b/x11-misc/ldm/ldm-2.2.3-r1.ebuild
deleted file mode 100644
index 8fca315..0000000
--- a/x11-misc/ldm/ldm-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EBZR_REVISION="1389"
-EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk"
-EBZR_BOOTSTRAP="autogen.sh"
-
-inherit bzr
-
-DESCRIPTION="LTSP Display Manager"
-HOMEPAGE="http://www.ltsp.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=dev-libs/glib-2.21
-	>=x11-libs/gtk+-2.18
-	app-text/iso-codes
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35.0"
-RDEPEND="${DEPEND} x11-themes/gtk-engines
-	x11-apps/xdm
-	x11-base/xorg-server"
-
-src_unpack() {
-	bzr_src_unpack
-	cd $S
-	epatch "${FILESDIR}/${P}-python3.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dosym ltsp /usr/share/ldm/themes/default
-
-	dodoc README
-	dodoc README-DEVELOPMENT-POLICY
-	dodoc LTSP_LOGO_COPYRIGHT
-}
diff --git a/x11-misc/ldm/ldm-2.2.4.ebuild b/x11-misc/ldm/ldm-2.2.4.ebuild
index e18b244..83043ac 100644
--- a/x11-misc/ldm/ldm-2.2.4.ebuild
+++ b/x11-misc/ldm/ldm-2.2.4.ebuild
@@ -6,7 +6,7 @@ EBZR_REVISION="1399"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk"
 EBZR_BOOTSTRAP="autogen.sh"
 
-inherit bzr
+inherit bzr autotools
 
 DESCRIPTION="LTSP Display Manager"
 HOMEPAGE="http://www.ltsp.org/"
diff --git a/x11-misc/ldm/ldm-9999.ebuild b/x11-misc/ldm/ldm-9999.ebuild
index bbe213c..1dc1f18 100644
--- a/x11-misc/ldm/ldm-9999.ebuild
+++ b/x11-misc/ldm/ldm-9999.ebuild
@@ -5,7 +5,7 @@
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk"
 EBZR_BOOTSTRAP="autogen.sh"
 
-inherit bzr
+inherit bzr autotools
 
 DESCRIPTION="LTSP Display Manager"
 HOMEPAGE="http://www.ltsp.org/"