Fix "make install" with latest coreutils wrt #327353 by Michael M. Tung.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 35 insertions, 27 deletions

diff --git a/x11-misc/xdialog/ChangeLog b/x11-misc/xdialog/ChangeLog
index 3ce14830aa42..a9dab06901de 100644
--- a/x11-misc/xdialog/ChangeLog
+++ b/x11-misc/xdialog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xdialog
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdialog/ChangeLog,v 1.28 2009/02/22 15:56:19 nelchael Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdialog/ChangeLog,v 1.29 2010/07/08 08:26:04 ssuominen Exp $
+
+  08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> xdialog-2.3.1.ebuild,
+  +files/xdialog-2.3.1-install.patch:
+  Fix "make install" with latest coreutils wrt #327353 by Michael M. Tung.
 
   22 Feb 2009; Krzysiek Pawlik <nelchael@gentoo.org>
   -xdialog-2.2.1-r1.ebuild:
diff --git a/x11-misc/xdialog/Manifest b/x11-misc/xdialog/Manifest
index 40c122e6431e..4cfe02b243d7 100644
--- a/x11-misc/xdialog/Manifest
+++ b/x11-misc/xdialog/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xdialog-2.3.1-install.patch 347 RMD160 441f5e7db4478999b2e272e9ba94142f7a9758db SHA1 886b4fb748fe3f220a8457f8e756f835f6a0d1c0 SHA256 d3353a57b313b46ccafe2fc92662b7694602bd1bb6d302df0322b738b3828aa3
 AUX xdialog-2.3.1-no-strip.patch 1449 RMD160 f858a97c5b600688df7f88174a9606cf877fe7e9 SHA1 4adf45934ef89eab26de1f2606fffb16d75ce4fb SHA256 61e8dcbad6a26ca976f59e7b8e9ede6c12f1cac157f87246538d951cb0e1041d
 DIST Xdialog-2.3.1.tar.bz2 457938 RMD160 12085dfddc9217fe5f07510c76755eb75446e658 SHA1 292c552506633c54a28d51aa290277b7b5c0c708 SHA256 1d446899697145fc36623d8afdd274066177da9383a6b619c18e8eb1b2ba589a
-EBUILD xdialog-2.3.1.ebuild 1058 RMD160 38d625fcbfb2c3b90008c5f79f264dbc6b167dc2 SHA1 0eac31897945c06704836c5f010f4b15d875462c SHA256 63e04491b8402bb35b6fc8f393236b8a5c6a833cb308bd32f56e829a769502d6
-MISC ChangeLog 3512 RMD160 4bf021e23128fc26d1edeab50d72849272ee2349 SHA1 b5e3bec0cf2326e6a7ea4cb68802a69bf32242f2 SHA256 65a18696df6f7c3bf7a6987e2a6a6ab9ef51d161490ca2babd9ff0c704a45fb7
+EBUILD xdialog-2.3.1.ebuild 1011 RMD160 d189fbf0e0554b60d8b02ab5194e0099afa3079c SHA1 0f6708ffa891110d901041f4f30b8290d1a9e098 SHA256 150d55deb1a3ba2b95a63eebf1a0f0ef4b15fc5021b91940355a8ed15ca52540
+MISC ChangeLog 3703 RMD160 27cf05f2dc0a706883e90fc6d0bab75728589180 SHA1 ee74e690df73bfc61d03f94867319bc60e146a67 SHA256 73533f172ba2ca0271c1107fec91e280abe0c1baf3f71391fd84f1a4c4a43512
 MISC metadata.xml 166 RMD160 65eae9ccdc8705cc7bba18d44f5c622d303ff08e SHA1 cf07217f29e22eb46b75d6c4a363f48174a1afe5 SHA256 a7464db79737af5e19f9555c565fc9d3195546f61baa6d2ebed77705b6d1685e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkmhdagACgkQgo/w9rxVVVGlwwCfXLTV+vPNFCyR+Ai8Ydng+XCO
-CWsAn2RzKRn8K6YjlsDJhXF80uW/K7ZE
-=bF5Z
------END PGP SIGNATURE-----
diff --git a/x11-misc/xdialog/files/xdialog-2.3.1-install.patch b/x11-misc/xdialog/files/xdialog-2.3.1-install.patch
new file mode 100644
index 000000000000..f5a02b099d92
--- /dev/null
+++ b/x11-misc/xdialog/files/xdialog-2.3.1-install.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/327353
+
+--- doc/Makefile.am
++++ doc/Makefile.am
+@@ -6,7 +6,7 @@
+ 
+ CLEANFILES = index.html compatibility.html changelog.html license.html Xdialog.1
+ 
+-doc_DATA = index.html compatibility.html changelog.html license.html $(srcdir)/*.html $(srcdir)/*.png
++doc_DATA = $(srcdir)/*.html $(srcdir)/*.png
+ 
+ man_MANS = Xdialog.1
+ 
diff --git a/x11-misc/xdialog/xdialog-2.3.1.ebuild b/x11-misc/xdialog/xdialog-2.3.1.ebuild
index 064b7a318296..2f3c547edc23 100644
--- a/x11-misc/xdialog/xdialog-2.3.1.ebuild
+++ b/x11-misc/xdialog/xdialog-2.3.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdialog/xdialog-2.3.1.ebuild,v 1.6 2009/02/15 13:48:42 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xdialog/xdialog-2.3.1.ebuild,v 1.7 2010/07/08 08:26:04 ssuominen Exp $
 
-inherit eutils autotools
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="drop-in replacement for cdialog using GTK"
 HOMEPAGE="http://xdialog.dyns.net/"
@@ -13,27 +14,26 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ppc x86"
 IUSE="doc examples nls"
 
-RDEPEND=">=x11-libs/gtk+-2.2"
+RDEPEND=">=x11-libs/gtk+-2.2:2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-S="${WORKDIR}/${P/x/X}"
+S=${WORKDIR}/${P/x/X}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-no-strip.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{no-strip,install}.patch
 	eautoreconf
 }
 
-src_compile() {
-	econf $(use_enable nls) --with-gtk2
-	emake || die "emake failed."
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-gtk2
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die
 	rm -rf "${D}"/usr/share/doc
 
 	dodoc AUTHORS BUGS ChangeLog README