Version bump yubikey-related packages. Close bugs #394565, #394563, #423289, #371345, #394567. Remove old and old patch.

(Portage version: 2.2.0_alpha112/cvs/Linux x86_64)

3 files changed, 19 insertions, 25 deletions

diff --git a/sys-auth/libyubikey/ChangeLog b/sys-auth/libyubikey/ChangeLog
index a5671c3fcc6d..6b12ab75910e 100644
--- a/sys-auth/libyubikey/ChangeLog
+++ b/sys-auth/libyubikey/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/libyubikey
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libyubikey/ChangeLog,v 1.2 2012/06/24 10:07:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libyubikey/ChangeLog,v 1.3 2012/06/24 10:32:20 flameeyes Exp $
+
+*libyubikey-1.9 (24 Jun 2012)
+
+  24 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org> +libyubikey-1.9.ebuild,
+  -files/libyubikey-1.6-rpath.patch, -libyubikey-1.6.ebuild:
+  Version bump yubikey-related packages. Close bugs #394565, #394563, #423289,
+  #371345, #394567. Remove old and old patch.
 
   24 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> libyubikey-1.6.ebuild:
   USE="static-libs" and convert to prune_libtool_files() function. Remove
@@ -13,4 +20,3 @@
   +libyubikey-1.6.ebuild, +files/libyubikey-1.6-rpath.patch, +metadata.xml:
   Add libyubikey, proxy-maintained by Brant Gurganus. Ebuild and patch from
   bug #342103, updated for style and repoman.
-
diff --git a/sys-auth/libyubikey/files/libyubikey-1.6-rpath.patch b/sys-auth/libyubikey/files/libyubikey-1.6-rpath.patch
deleted file mode 100644
index 9c6432cc9e6e..000000000000
--- a/sys-auth/libyubikey/files/libyubikey-1.6-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libyubikey-1.6/Makefile.am
-===================================================================
---- libyubikey-1.6.orig/Makefile.am
-+++ libyubikey-1.6/Makefile.am
-@@ -59,7 +59,6 @@ ykgenerate_LDADD = ./libyubikey.la
- 
- # Self tests.
- 
--AM_LDFLAGS = -no-install
- LDADD = libyubikey.la
- 
- check_PROGRAMS = selftest
diff --git a/sys-auth/libyubikey/libyubikey-1.6.ebuild b/sys-auth/libyubikey/libyubikey-1.9.ebuild
index e2b29e96dc1d..2308844096c3 100644
--- a/sys-auth/libyubikey/libyubikey-1.6.ebuild
+++ b/sys-auth/libyubikey/libyubikey-1.9.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libyubikey/libyubikey-1.6.ebuild,v 1.2 2012/06/24 10:07:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libyubikey/libyubikey-1.9.ebuild,v 1.1 2012/06/24 10:32:19 flameeyes Exp $
 
 EAPI=4
-inherit autotools eutils
+
+inherit eutils
 
 DESCRIPTION="Yubico C low-level library"
-HOMEPAGE="http://code.google.com/p/yubico-c/"
+HOMEPAGE="https://github.com/Yubico/yubico-c"
 SRC_URI="http://yubico-c.googlecode.com/files/${P}.tar.gz"
 
 KEYWORDS="~amd64"
@@ -14,18 +15,17 @@ SLOT="0"
 LICENSE="BSD-2"
 IUSE="static-libs"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-rpath.patch
-	sed -i -e '/AM_INIT_AUTOMAKE/s: -Werror::' configure.ac || die #423255
-	eautoreconf
-}
-
 src_configure() {
 	econf $(use_enable static-libs static)
 }
 
+src_test() {
+	emake check
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README THANKS
+	default
 	prune_libtool_files
 }