Fix build issues. Per bug #265549.

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

4 files changed, 40 insertions, 4 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 463ac2a2132d..ba1b35fb57e5 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.70 2009/04/09 09:22:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.71 2009/04/09 17:14:46 scarabeus Exp $
+
+  09 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/2.4.6-makefile.patch, libdrm-2.4.6.ebuild:
+  Fix build issues. Per bug #265549.
 
 *libdrm-2.4.6 (09 Apr 2009)
 
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 588c71119778..ca0b19983068 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,4 +1,5 @@
 AUX 2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch 1072 RMD160 dcc181854552f2a4e6466fe5ed45bae7240b4ef0 SHA1 b33355561f3951a22eff352d077ea4d4f145bbbc SHA256 48dfaabfaff6e4124673a1d430493eb93660703eb334f7019db0d4845f3b2f53
+AUX 2.4.6-makefile.patch 557 RMD160 9e82191fac3080927748832072c4e6aa2c5859e6 SHA1 74c2c97019b3f36f6eecef017b21ac96d6d73014 SHA256 4a9c7411f7b544e87bbef9f621536b9ab9409306c0862e30bbf411443df30654
 DIST libdrm-2.3.0.tar.gz 391509 RMD160 2ca594cf17fc074b1addd1f370dd3409b5a03dd7 SHA1 fd62459b11c39a58e5b45b8af30a8217d5ce0e1b SHA256 76f90a22e141832bccea3fabf14e2b2a53e1ff72fe8414e2836ea8ac7e2e3dab
 DIST libdrm-2.3.1.tar.gz 413300 RMD160 15c8f03bb11f58a272eaf89f988e96256a7f43f1 SHA1 007903c738df3bc2a3cdab0289635baa95a2ed7a SHA256 1d1ad058916a412ec56c3a541c6d921dda11e015909105e84bd260d87ae25465
 DIST libdrm-2.4.1.tar.gz 462373 RMD160 4fa1df2853228687c16dbcc47698c66416df61f3 SHA1 583c1c62f70877ec592245ca0316375662eeb693 SHA256 dd84fd09984d700225b6261d87a1deb8b92c6928318e815bf938f2b44deaa529
@@ -13,6 +14,6 @@ EBUILD libdrm-2.4.1.ebuild 1482 RMD160 8e9e46dcaa84c27a9dd9309cf859b332edd8b588
 EBUILD libdrm-2.4.3.ebuild 895 RMD160 cdc12362df42c27e83d5f1028e014296c794d1c5 SHA1 85243f13e5ab13641033077fcc65546969c82450 SHA256 55fd58f3d30a13f5380a95864dae69b292e23cc8d102d9c018297db4f11159e2
 EBUILD libdrm-2.4.4.ebuild 927 RMD160 00f6805b0dc0855133ac9ccec4dd6b6fb7cb3be1 SHA1 9270f660386377e299f109db850abaf94d9ed192 SHA256 4544456512df5f3feac9b239366ebd71de344a545ae5e35861714300b6ae005c
 EBUILD libdrm-2.4.5.ebuild 926 RMD160 4267ca2e0ae4f189ac719650f4fe72e654529cda SHA1 27e88d338406cbf1e1d3e786d4ecf86c7498594f SHA256 20b94a6e8420437744d0ec5c932efab4d42059bd8317c2f3bd444d9c2e460c02
-EBUILD libdrm-2.4.6.ebuild 933 RMD160 0199bf1d910ce4cdda29494959346e4a0173df53 SHA1 3b400a147d8f879e03b5c8da359453c7c195c00d SHA256 5aa0c37fdbc7e2736a4545cc9402e9282fd296cad0749946dae0b9a045d2e2ff
-MISC ChangeLog 9188 RMD160 cdc67a8df0cdc5084150f58581fe7960c99aac70 SHA1 4b4e228d83dbf8ed5c9237b08306fc6135b3f589 SHA256 baafa6507f4ff10e273eee3327570c4062299a47c36bb22353d8bbae4b6ff438
+EBUILD libdrm-2.4.6.ebuild 1047 RMD160 535d36cb448f4979db836c794c3d165564eabe54 SHA1 111652a90b8c63716798dd85473259b6cd43896f SHA256 7774059e24c809ade7911d198b2162cc9232ea9d3a6d2d03230e39c5af620f0f
+MISC ChangeLog 9330 RMD160 fc073288b89aef28d760cf14dee4d54f4687cc52 SHA1 d8d650f39e214dcaa59e072e3ccd80da8900ed82 SHA256 5f43bdb40a4ac8b46b5792f513c025d7500b7359e24a89c531023372e166ef4e
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libdrm/files/2.4.6-makefile.patch b/x11-libs/libdrm/files/2.4.6-makefile.patch
new file mode 100644
index 000000000000..61bee916ca64
--- /dev/null
+++ b/x11-libs/libdrm/files/2.4.6-makefile.patch
@@ -0,0 +1,22 @@
+From 1faab66cfd1a854925da6ff7109aa614292dea90 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Mon, 06 Apr 2009 23:26:32 +0000
+Subject: drm: fix test makefile
+
+no idea if this is correct but it works so meh
+---
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index bc99447..e5e9fc4 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -2,6 +2,8 @@ AM_CFLAGS = \
+ 	-I $(top_srcdir)/shared-core \
+ 	-I $(top_srcdir)/libdrm
+ 
++AM_LDFLAGS = $(top_builddir)/libdrm/libdrm.la
++
+ noinst_PROGRAMS = \
+ 	dristat \
+ 	drmstat
+--
+cgit v0.8.2
diff --git a/x11-libs/libdrm/libdrm-2.4.6.ebuild b/x11-libs/libdrm/libdrm-2.4.6.ebuild
index 8316ed90832c..13e4117c9b9f 100644
--- a/x11-libs/libdrm/libdrm-2.4.6.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.6.ebuild,v 1.1 2009/04/09 09:22:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.6.ebuild,v 1.2 2009/04/09 17:14:46 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -18,8 +18,17 @@ RESTRICT="test" # see bug #236845
 RDEPEND="dev-libs/libpthread-stubs"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-makefile.patch
+)
 # FIXME, we should try to see how we can fit the --enable-udev configure flag
 
+src_unpack() {
+	x-modular_src_unpack
+	eautoreconf
+	elibtoolize
+}
+
 pkg_postinst() {
 	x-modular_pkg_postinst