Use pkg-config instead of AC_CHECK_LIB to get ncurses libraries wrt #459650 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 105 insertions, 53 deletions

diff --git a/sys-apps/qingy/ChangeLog b/sys-apps/qingy/ChangeLog
index 185d3e841364..0e95b5eac9b7 100644
--- a/sys-apps/qingy/ChangeLog
+++ b/sys-apps/qingy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/qingy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.68 2013/02/02 12:10:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/ChangeLog,v 1.69 2013/03/05 10:10:31 ssuominen Exp $
+
+  05 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> qingy-1.0.0.ebuild,
+  +files/qingy-1.0.0-tinfo.patch:
+  Use pkg-config instead of AC_CHECK_LIB to get ncurses libraries wrt #459650
+  by Diego Elio Pettenò
 
   02 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup up due #48914
diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index ec7ae8577e09..b30eeb8f939e 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -2,16 +2,21 @@
 Hash: SHA256
 
 AUX 50qingy-gentoo.el 234 SHA256 f95633e23607471da085fcc888d73ab2c76e838a1426b0698a0a0041651dbd1c SHA512 923d2874ad8cf7e79d409dd8978d03b040a6e1ec94de24749b832fbc208210039d8989a14fe33002f4ce6241f3efa227776a01ab84be47ec8abbf595c0c84fd0 WHIRLPOOL 6ad5c6a2b35a7523937ff175bd89cafd3858c956c46a3c27bbb968918b0c57c798ef9d18e8a9f006598a621713a9db05fe8898241fa5c5a0c56d249369275b8b
+AUX qingy-1.0.0-tinfo.patch 1573 SHA256 f61c69bc7823e360b26b04a0ca16d7001dca8dcd07c932911298a79286296f27 SHA512 a37b92e3e4da0e87687461df7644fbf1b3adef81ecdee411073bb0593875c493cc110e9925c8131b99bc97d143a811190e5e6d03cc4992a18396135936697fcc WHIRLPOOL dfcfef8438856099d58d3e2c17504dfa8634bd8215f2f32a13bf1c1c0cfc4983d71a2865401fd62977c80cd0a873b103c634bad9f377f03a1a50a69d087ceee3
 AUX qingy-logrotate 75 SHA256 bf30d9b8a6cf3bf15ff22cd29134e06174fee0ce2aaef4ee383d3c14fe859e44 SHA512 3b22cac09fc7394a4a4aa5a786309378cd769c351eed1e2813b84230c6ec74f7c30bfec9c6a03682b2ad5063a30bbdaac679f9e07bab2cee75ec73dd137aca01 WHIRLPOOL 05e72c85f7c4a700aec7b440b157ec2b619324eebe9def716bb5e92f57da7958d2a75b2518d1d1531cadecfb165dad33fa98dec00f9b42c2e4997058fb72b793
-DIST qingy-1.0.0.tar.bz2 611393 SHA256 de4b4b398d5ba81ab2544729864676a04ddc6ae818b357ee09a8770293740cd3
-DIST qingy-gentoo-theme-2.1.tar.bz2 150702 SHA256 1b770255577ed3fc89e1cfdf5019990bf4deffab26201e095084dd5bd97bf093
-EBUILD qingy-1.0.0.ebuild 3913 SHA256 68f2e59bc47ab302142d7fd540fa30b936a26bb4a2ad3dbe92f202f75126a23f SHA512 7395b365653d8389ed88cd565ac00b8ae9c6073aa1d8ca9d11799dbaa25caefc03f24a9a39b1ccbe271b2364ebded226699ec12d8aaceaed7d37ceab22e17be2 WHIRLPOOL dd3318acf26b16f39b377c072d159d5f2faf8dd71bff35c1b0bbf09d6d9e27f24d852c7fdd51c6919b1a71773857e0ae8255b2b209c51c6b8d2b6f6abb8e2a78
-MISC ChangeLog 10740 SHA256 54c61d7fb16055a08d0dafe3f9602073aa6e423ce668ad2842d939fe4b9e5650 SHA512 d51ca449d786228de2734708b68f02af86e7676ea14eb2bd770d97b85fb5f958cd0438838dd183ee50c1bfc1e85fefbd8bae4fbc6434d21550d240dcc6b056d6 WHIRLPOOL b555683436dbb4aa29a4ac305461e4a5c6bb7b3963e1c304fc8f123b850de657db2803b881af004749db679ca5a5f99a59e4365dddde7640c8c47db553e45f98
+DIST qingy-1.0.0.tar.bz2 611393 SHA256 de4b4b398d5ba81ab2544729864676a04ddc6ae818b357ee09a8770293740cd3 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54 WHIRLPOOL 6282fc649d2be91adae544732cef0e10ca77083b18c9cd2fdd3c6369061f797903e98bac34e01095ed7e060a3f12845d6d5523f3ff9e7979c3105dc8388aa24c
+DIST qingy-gentoo-theme-2.1.tar.bz2 150702 SHA256 1b770255577ed3fc89e1cfdf5019990bf4deffab26201e095084dd5bd97bf093 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd WHIRLPOOL 2ef7e404a1e14229c895cb96de0dd3749e0e9837b884f2f16b71a741140586a56f52a85d2e942bc2963af2ea174d134d811e72655995285f827a16df9c671147
+EBUILD qingy-1.0.0.ebuild 3639 SHA256 0422d0b91da66c54ec85c586748b015549babe1b447c651e6c4c645564992b02 SHA512 c1fd8f394cce23e02f5b255e6629899b3714fc6fb642c0f8231d8a27f67f0da0e9f43ab88345b815309bc2f3423475facc02310a8f532438612c7727ef0b380e WHIRLPOOL 6104213bd2df4d21ff0b365d651621f2d9e6e20b4b69e8fb41cdf4028db06d2be430a7df0f89af000002d783f3fa30713dcb4209ae8863190a06af965f43c11e
+MISC ChangeLog 10956 SHA256 591bfc175f943f8aa2ac3a915f81cd2259ea9b6266f5846c1b91c1e52be3ace8 SHA512 d8d09296fea640ff651481f6ba975d7eb4578bae37d3fd345dc113ccb07eaa631b73de072bd38a57a1accafc776afb98cb60e8ef94c4966cfef0afd4e80f66b7 WHIRLPOOL 3eab12c4508d6c8bfa8faebaf4eb8b55be4f3bef557bd249fe8e9cf025badce0aad7a1ca3ebd465015c070fc1164682797a9a62db071b182f64bcd07997f61be
 MISC metadata.xml 296 SHA256 b3cbbe8a059777c802abfc0eba4a0f7549bd1852ede4bc010c10fb909c5fec23 SHA512 198701183c374b3a950cd5a406a82374e4e3521dadd7a4e6a945214ef5c542a5c02bbe4fa4d07812a1c851257cb17e921a44d28eba448f3f7a9738ce42624cea WHIRLPOOL 888e945bca89f564e38f0220e8e116487e310ad439cc2f7f8b57ab5d0ba85ebd04913650c13a4bffa31aa9f65deda71ff6b807fae98ec69abe87d42ec69353a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlENAikACgkQCaWpQKGI+9SvHwCdH5hpxYdhUanFAleXw1FYBwwN
-uuUAmQGUTzNb25l/Qlwmm5A9CKzN44MH
-=zbm1
+iQEcBAEBCAAGBQJRNcQ1AAoJEEdUh39IaPFNhHQH/1jfagzXBjxUS87gmfv9hjiz
+R0HLDHkAjLJBAJrm2MrPbuIIIarERGuqcALwfeg02AbEDCRPVh3z0073d/bKoDZk
+IRqfZ54GSaInCcn/qcjavQewCBL9hFltp5hWbYUCFIrPMkFlbBnZo2vD+MXQ/RDn
+OTqLDVtvCJRHtWAjrMpEvJqYrmRlSOgBobgr+wkL6sqOVNMzEydi0CnMvti09onp
+6uzHE9LqAStfcZWDlCjnC41ywSqZfv8YjuITELII0nhzxV2f85NNHUIV6K5aWC5k
+HVA0m0d+oZUvUERP93y1LLcw2Fpv1+XGWGquhtiTxXa/agYxG2u+2aVKk6fqs1o=
+=xCnL
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/qingy/files/qingy-1.0.0-tinfo.patch b/sys-apps/qingy/files/qingy-1.0.0-tinfo.patch
new file mode 100644
index 000000000000..f752996c92f5
--- /dev/null
+++ b/sys-apps/qingy/files/qingy-1.0.0-tinfo.patch
@@ -0,0 +1,42 @@
+Use ncurses.pc to get Libs: instead of using AC_CHECK_LIB because ncurses can be configured
+to have separate termcap library called libtinfo; and we need both -ltinfo and -lncurses for
+linking since symbols are used from both
+
+http://bugs.gentoo.org/459650
+
+--- configure.in
++++ configure.in
+@@ -125,12 +125,7 @@
+ # End compile emacs stuff
+ 
+ # Check for ncurses
+-	HEADERS="curses.h term.h"
+-	NCURSESLIB=""
+-	AC_CHECK_HEADERS([$HEADERS],,[AC_MSG_ERROR([$HEADERS_ERROR_MESSAGE])],)
+-	AC_CHECK_LIB(ncurses, setupterm, [NCURSESLIB="-lncurses"],[AC_MSG_ERROR([$LIBRARIES_ERROR_MESSAGE])] , )
+-	AC_CHECK_LIB(ncurses, tputs,     [NCURSESLIB="-lncurses"],[AC_MSG_ERROR([$LIBRARIES_ERROR_MESSAGE])] , )
+-	AC_SUBST(NCURSESLIB)
++	PKG_CHECK_MODULES(NCURSES, ncurses, [], [AC_MSG_ERROR([$LIBRARIES_ERROR_MESSAGE])])
+ # End check for ncurses
+ 
+ # Check for PAM support
+--- src/libraries/Makefile.am
++++ src/libraries/Makefile.am
+@@ -4,7 +4,7 @@
+ INCLUDES      = -I../.. -I../
+ BUILT_SOURCES = parse_settings.h
+ 
+-AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DSBINDIR=\"$(sbindir)/\"
++AM_CFLAGS = -DSETTINGS_DIR=\"$(sysconfdir)/qingy\" -DSBINDIR=\"$(sbindir)/\" $(NCURSES_CFLAGS)
+ 
+ if !WANT_STATIC
+ pkglib_LTLIBRARIES = libqingy.la
+@@ -35,7 +35,7 @@
+ EXTRA_libqingy_la_SOURCES =           \
+     crypto_openssl.c crypto_libgcrypt.c crypto.h
+ 
+-libqingy_la_LIBADD  = @PASSWDLIB@ @CRYPTOLIB@ @NCURSESLIB@ @XLIBS@
++libqingy_la_LIBADD  = @PASSWDLIB@ @CRYPTOLIB@ @XLIBS@ $(NCURSES_LIBS)
+ libqingy_la_LDFLAGS = -release @VERSION@
+ 
+ libqingy_static_la_SOURCES = $(libqingy_la_SOURCES)
diff --git a/sys-apps/qingy/qingy-1.0.0.ebuild b/sys-apps/qingy/qingy-1.0.0.ebuild
index dccb802e2c78..31c6fc5e9650 100644
--- a/sys-apps/qingy/qingy-1.0.0.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-1.0.0.ebuild,v 1.5 2012/05/04 09:17:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/qingy/qingy-1.0.0.ebuild,v 1.6 2013/03/05 10:10:31 ssuominen Exp $
 
-EAPI="2"
+EAPI=5
+inherit autotools elisp-common eutils pam
 
-inherit elisp-common eutils pam
-
-GENTOO_THEME_VERSION="2.1"
+GENTOO_THEME_VERSION=2.1
 
 DESCRIPTION="a DirectFB getty replacement"
 HOMEPAGE="http://qingy.sourceforge.net/"
@@ -18,26 +17,31 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="crypt directfb emacs gpm opensslcrypt pam static X"
 
-RDEPEND=">=sys-libs/ncurses-5.4-r6
-	opensslcrypt? ( >=dev-libs/openssl-0.9.7e )
-	crypt?        ( >=dev-libs/libgcrypt-1.2.1 )
-	directfb?     ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] )
-	emacs?        ( virtual/emacs )
-	pam?          ( >=sys-libs/pam-0.75-r11 )
-	X?            ( x11-libs/libX11
-					x11-libs/libXScrnSaver
-					x11-proto/scrnsaverproto )"
-
+RDEPEND=">=sys-libs/ncurses-5.7-r7:=
+	opensslcrypt? ( dev-libs/openssl:0= )
+	crypt? ( >=dev-libs/libgcrypt-1.2.1:= )
+	directfb? ( >=dev-libs/DirectFB-1.4.2[fbcon,jpeg,png,truetype] )
+	emacs? ( virtual/emacs )
+	pam? ( >=sys-libs/pam-0.75-r11 )
+	X? (
+		x11-libs/libX11:=
+		x11-libs/libXScrnSaver:=
+		x11-proto/scrnsaverproto
+	)"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-apps/sed-4.1.4-r1"
+	>=sys-apps/sed-4.1.4-r1
+	virtual/pkgconfig"
 RDEPEND="${RDEPEND}
 	pam? ( sys-auth/pambase )"
 
 SITEFILE=50${PN}-gentoo.el
 
-src_configure()
-{
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
 	local crypto_support="--disable-crypto"
 	local emacs_support="--disable-emacs --without-lispdir"
 
@@ -48,55 +52,51 @@ src_configure()
 		echo
 	fi
 
-	use emacs 		 && emacs_support="--enable-emacs --with-lispdir=${SITELISP}/${PN}"
+	use emacs && emacs_support="--enable-emacs --with-lispdir=${SITELISP}/${PN}"
 	use opensslcrypt && crypto_support="--enable-crypto=openssl"
-	use crypt        && crypto_support="--enable-crypto=libgcrypt"
-	econf                                      \
-		--sbindir=/sbin                        \
-		--disable-optimizations                \
-		`use_enable pam`                       \
-		`use_enable static static-build`       \
-		`use_enable gpm gpm-lock`              \
-		`use_enable X x-support`               \
-		`use_enable directfb DirectFB-support` \
-		${crypto_support}                      \
-		${emacs_support}					   \
-		|| die "Configuration failed"
+	use crypt && crypto_support="--enable-crypto=libgcrypt"
+	econf \
+		--sbindir=/sbin \
+		--disable-optimizations \
+		$(use_enable pam) \
+		$(use_enable static static-build) \
+		$(use_enable gpm gpm-lock) \
+		$(use_enable X x-support) \
+		$(use_enable directfb DirectFB-support ) \
+		${crypto_support} \
+		${emacs_support}
 }
 
-src_install()
-{
+src_install() {
 	# Copy documentation manually as make install only installs info files
 	# INSTALL is left because it contains also configuration informations
 	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
 
 	# Install the program
-	emake DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install
 
 	# Set the settings file umask to 600, in case somebody
 	# wants to make use of the autologin feature
-	/bin/chmod 600 "${D}/etc/qingy/settings"
+	/bin/chmod 600 "${D}"/etc/qingy/settings
 
 	# Install Gentoo theme
 	dodir /usr/share/${PN}/themes/gentoo
-	cp "${WORKDIR}"/gentoo/* "${D}/usr/share/${PN}/themes/gentoo" \
-		|| die "Gentoo theme installation failed"
+	cp "${WORKDIR}"/gentoo/* "${D}"/usr/share/${PN}/themes/gentoo || die
 
 	# Alter config file so that it uses our theme
-	sed -i 's/theme = "default"/theme = "gentoo"/' "${D}/etc/${PN}/settings"
+	sed -i 's/theme = "default"/theme = "gentoo"/' "${D}"/etc/${PN}/settings
 
 	# Install log rotation policy
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}-logrotate" ${PN} || die "Log rotation policy installation failed"
+	newins "${FILESDIR}"/${PN}-logrotate ${PN}
 
-	use emacs && elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 
-	rm "${D}/etc/pam.d/qingy"
+	rm "${D}"/etc/pam.d/qingy
 	pamd_mimic system-local-login qingy auth account password session
 }
 
-pkg_postinst()
-{
+pkg_postinst() {
 	einfo "In order to use qingy you must first edit your /etc/inittab"
 	einfo "Check the documentation at ${HOMEPAGE}"
 	einfo "for instructions on how to do that."