Fix freetype[bzip2] link problem (bug 416955, thanks tokiclover)

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

4 files changed, 62 insertions, 8 deletions

diff --git a/sys-power/suspend/ChangeLog b/sys-power/suspend/ChangeLog
index ddf83e1def29..24d7900eb534 100644
--- a/sys-power/suspend/ChangeLog
+++ b/sys-power/suspend/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/suspend
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/ChangeLog,v 1.22 2012/05/04 07:36:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/ChangeLog,v 1.23 2012/05/22 13:26:18 xmw Exp $
+
+  22 May 2012; Michael Weber <xmw@gentoo.org> suspend-1.0.ebuild,
+  +files/suspend-1.0-bzip2.patch:
+  Fix freetype[bzip2] link problem (bug 416955, thanks tokiclover)
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> suspend-0.8-r1.ebuild,
   suspend-1.0.ebuild:
diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest
index dee439951c89..f20ef76af719 100644
--- a/sys-power/suspend/Manifest
+++ b/sys-power/suspend/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX suspend-1.0-bzip2.patch 971 RMD160 36a6e037b6a7bd6ccbca6725217003f26bda7319 SHA1 572a77ab74a2591426bf95a73a37b6eae15ee116 SHA256 1c04b63719043c4d8c962a87bf6b8f33f1c2a2df7302c2c0afd5e9135ec8ca3e
 AUX suspend-1.0-errno.patch 240 RMD160 2ed4a26fad8b21fd88ed9710b0d70eacc259c673 SHA1 f902e7f8394596d19c9858044fd05b42a7366767 SHA256 88eae010830c90b4fe6f115c3d638df5751f0ffa1cab4342aa33031fe14e9c03
 AUX suspend-overflow-gentoo.patch 1546 RMD160 998a9d59da92cac7410351c8f672e14e8317dfb6 SHA1 ad10780af2a772be738182f07139d57a8f4487b7 SHA256 7ca6a2c59947978cb55c2f6de115b38bed07b729c8dcfb9c191e1a43102846d9
 DIST suspend-0.8.tar.gz 414135 RMD160 cd481fdb5206c824bf8138be0061bf98c0410f76 SHA1 acc9fb8f85d35f3e12c8406be1e958fc67ece01c SHA256 a5ee1dcfeb05e9c2a63583d7518065d42dc83264144359a2456fd8b9c71e63ee
 DIST suspend-utils-1.0.tar.bz2 408451 RMD160 2eee4a2a3e987763663f98522ed142d9d1e58226 SHA1 49ac219b54780265c31e8263d00e2b7b525d0736 SHA256 0206ba6332860b6da57acc79cc0f8604150ef0835ff9633fd42d59d181a6c85d
 EBUILD suspend-0.8-r1.ebuild 1285 RMD160 94f29c2bc4ffdb35e44acf5e24ef5781a2a93518 SHA1 b0f0724f6a47ec61ad0ade8c766665e64e35ce01 SHA256 2e1a98cddac6a6580dedea5199b2ac814552fe5fb28f668e32e848f909680e42
-EBUILD suspend-1.0.ebuild 1345 RMD160 78c82144302a90640c7eeeb5643518f4b17045ed SHA1 a15901fbbff09baf26d1a805eb327cdba68f3434 SHA256 ceb2005fbc73d5cfe1bf594685fbfad6056b56c4b8adb047fa72782607c26d6a
-MISC ChangeLog 3778 RMD160 382d9ff9769bc49df08a944483268315597d6780 SHA1 bc217b1eea884afb8388c551d48a0fa78660ee9f SHA256 cc2eb49ca2189881fa6960f3d78eaa8581e9b2f225033a5539d77432f80acf2a
+EBUILD suspend-1.0.ebuild 1387 RMD160 e8fdb6ab5ca554ac61a53959e67047ba72a59c2e SHA1 c0f1f803ebd87bb8d8d3b516e28204233f8abc7b SHA256 9f88b21abb6000576c068f59508a86bbf826b2a172d8e3fb844057701e95f192
+MISC ChangeLog 3943 RMD160 193a366c33875a4f1e3f935edff7103f4c5099d3 SHA1 fcbe7004496e9349cd2ff38fcdd43fef6201b73f SHA256 c43e0b4d368a904527d59cd242dc4a72a5855a74c0b0db915c8704ac3e54ba68
 MISC metadata.xml 384 RMD160 1a2eb73dd0938e4bd483e7860e01182129be4557 SHA1 8f597f3d3db39f768af9c662bf18e6624354bdd4 SHA256 7498683da95c7412252f6c9f503984a2ae6f170bb110913e79cb32ccf86dac91
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF0EAREIAAYFAk+7k/AACgkQknrdDGLu8JD3GQD/e4v43pEytcC6Uw09JWGG30y/
+oh8LK4dfktSaVn0DE2cA+IezNg54/zbHvm+a/DcZwZk7J9uCwB12+rJ1iUXbVgs=
+=hELR
+-----END PGP SIGNATURE-----
diff --git a/sys-power/suspend/files/suspend-1.0-bzip2.patch b/sys-power/suspend/files/suspend-1.0-bzip2.patch
new file mode 100644
index 000000000000..abe5afab819b
--- /dev/null
+++ b/sys-power/suspend/files/suspend-1.0-bzip2.patch
@@ -0,0 +1,37 @@
+--- a/Makefile.am	2011-03-07 00:24:15.000000000 +0100
++++ b/Makefile.am	2012-05-22 10:52:49.023010001 +0200
+@@ -171,7 +171,8 @@
+ 	fbsplash_funcs.c \
+ 	fbsplash-test.c
+ fbsplash_test_LDADD=\
+-	$(FBSPLASH_LIBS)
++	$(FBSPLASH_LIBS) \
++	$(BZ2_LIBS)
+ 
+ whitelist.c: whitelist.csv
+ 	$(PERL) wlcsv2c.pl whitelist.csv whitelist.c
+--- a/configure.ac	2011-03-07 00:24:15.000000000 +0100
++++ b/configure.ac	2012-05-22 10:52:37.918148832 +0200
+@@ -74,6 +74,22 @@
+ 	,
+ 	[enable_fbsplash="no"]
+ )
++BZ2_LIBS=
++AS_IF(
++  [test "x${fbsplash}" = "xyes"],
++  [
++    PKG_CHECK_MODULES(
++      [FREETYPE2],
++      [freetype2],
++      ,
++      [AC_MSG_ERROR([freetype was not found.])]
++    )
++    AC_CHECK_LIB([bz2], [BZ2_bzDecompress],
++      [BZ2_LIBS="${BZ2_LIBS} -lbz2"],
++      [AC_MSG_ERROR(['libbz2' library was not found.])]
++    )
++  ]
++)
+ AC_ARG_WITH(
+ 	[devdir],
+ 	[AC_HELP_STRING([--with-devdir=DIR], [use if --enable-create-device, put devices in this directory, default /dev])],
diff --git a/sys-power/suspend/suspend-1.0.ebuild b/sys-power/suspend/suspend-1.0.ebuild
index 87c3f1ac2bef..86f90f967746 100644
--- a/sys-power/suspend/suspend-1.0.ebuild
+++ b/sys-power/suspend/suspend-1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/suspend-1.0.ebuild,v 1.3 2012/05/04 07:36:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/suspend/suspend-1.0.ebuild,v 1.4 2012/05/22 13:26:18 xmw Exp $
 
-EAPI=2
+EAPI=4
 
 inherit autotools eutils
 
@@ -34,6 +34,8 @@ S="${WORKDIR}/${P/-/-utils-}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-errno.patch
+	epatch "${FILESDIR}"/${P}-bzip2.patch
+	eautoreconf
 }
 
 src_configure() {
@@ -42,12 +44,12 @@ src_configure() {
 		--enable-compress \
 		$(use_enable crypt encrypt) \
 		$(use_enable fbsplash) \
-		$(use_enable threads) \
-		|| die
+		$(use_enable threads)
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	dodir etc
+	emake DESTDIR="${D}" install
 }
 
 pkg_postinst() {