dev-libs/libconcord: Version bump, #217892

Package-Manager: portage-2.1.12.2

6 files changed, 88 insertions, 57 deletions

diff --git a/dev-libs/libconcord/ChangeLog b/dev-libs/libconcord/ChangeLog
index b3281db1..19a7a716 100644
--- a/dev-libs/libconcord/ChangeLog
+++ b/dev-libs/libconcord/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*libconcord-1.0 (05 Jun 2013)
+
+  05 Jun 2013; Bertrand Jacquin <beber@meleeweb.net>
+  +files/libconcord-1.0-pkg-config.patch, +libconcord-1.0.ebuild,
+  -files/libconcord-0.23-flash.patch, -libconcord-0.23.ebuild:
+  dev-libs/libconcord: Version bump, #217892
+
   04 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> -libconcord-0.20.ebuild,
   -libconcord-0.21.ebuild, -libconcord-0.22.ebuild:
   dev-libs/libconcord: remove old release
diff --git a/dev-libs/libconcord/Manifest b/dev-libs/libconcord/Manifest
index beb5c8d0..3e3007a2 100644
--- a/dev-libs/libconcord/Manifest
+++ b/dev-libs/libconcord/Manifest
@@ -1,5 +1,5 @@
-AUX libconcord-0.23-flash.patch 411 SHA256 b754963c20c38e4007333ed858d48805fc642eeb48d87f089a8b5c4fa2c76e12 WHIRLPOOL 82edb346a1e52b034f0fc4f3057c9f3807fb23934a315e65d07af3cf7e955a1df4481a768fd2e4002fe35b9339b535d26ecab69c441ebdca0ebb7c2445100880
-DIST concordance-0.23.tar.bz2 991468 SHA256 47aaaad4e7f7e11ca0bbf9817c459ef7a7979cc9ecd73ac7eddcffb0063efc9f
-EBUILD libconcord-0.23.ebuild 898 SHA256 72cab4239a8c2f7a4b7796ef6340ec11b1dd0ccc453f1ee870a8de0c256a6dba WHIRLPOOL e2085e6e964a6f3892eebee8f2876f414f780f301b24528ce1639f44867278ad325383ee373e427ded529145e2ddabab07cae14285138f8f076f9a6c4f8b7a87
-MISC ChangeLog 1038 SHA256 3c63e9ea42346d2b6c3e00be3979a7a2d76766d433e09f2b30ffe56965903887 WHIRLPOOL 965254fd108dd14ab24740133b2f4e14c1da066bb5ab02449f9e9e797d6c30fcb417ce573a0514c1b6a2e57a0e8b400ea716b59f2a9f5d111754b6ca07758a03
+AUX libconcord-1.0-pkg-config.patch 844 SHA256 97f7a2d84fbe4731c0c3810def63aa2c41514a1002e368a486d2bf3f7783aa63 WHIRLPOOL 7f92afff85dfdfd5ac6a600c97bc3e53e818b8f7e011b960de8776a30f0410d40958c8a67c1bd7e97ef2ae8062064d5da6f3574f53abc7ef05e71dea2cac2731
+DIST concordance-1.0.tar.bz2 1119091 SHA256 f6f449e5cdf33207372d0e229e622b6107f227bfb476587abddc0b27c31eb65a WHIRLPOOL 66be048824760d2e0767dc8e463bc989dcba8c8f788ce2aa1169febf2dac611c923ee81fd7711f466444bff3643e502cb7eb5edc7c5d76bae5a4904cbd39754d
+EBUILD libconcord-1.0.ebuild 832 SHA256 d5c93aa1584a780593b7f0c64a3ff1643826f759a8a8fa266042a689e30de84f WHIRLPOOL 7e0884101c48db94f2d241ceac99f21713f8f7698e3947899ced52623ac39e92cd5be515d0dd906d4510eec5591ee82a25f56dc53fded75ad0c33df3625fa598
+MISC ChangeLog 1297 SHA256 438dffd39d5d0947dea044c274e5aacb18c71bea9c9055beb6276874d410b61c WHIRLPOOL 4b318c2e22f2b8f26f70dfc6bbeaa362a2b0c3973d98268fdf057ae0386d6a4ca776ef3a20f4954f105a8898275bae8c2fdea2b7e3a9646c6e11429bdb366177
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/dev-libs/libconcord/files/libconcord-0.23-flash.patch b/dev-libs/libconcord/files/libconcord-0.23-flash.patch
deleted file mode 100644
index 8ea4ee09..00000000
--- a/dev-libs/libconcord/files/libconcord-0.23-flash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- remote_info.h.orig	2011-01-25 22:37:20.436530749 -0600
-+++ remote_info.h	2011-01-25 22:38:38.498680286 -0600
-@@ -313,7 +313,7 @@ static const TArchInfo ArchList[]={
- 	{
- 		SERIAL_LOCATION_FLASH,		// serial_location
- 		0x000110,			// serial_address
--		0x000000,			// flash_base
-+		0x800000,			// flash_base
- 		0x810000,			// firmware_base
- 		0x820000,			// config_base
- 		0x810000,			// firmware_update_base
diff --git a/dev-libs/libconcord/files/libconcord-1.0-pkg-config.patch b/dev-libs/libconcord/files/libconcord-1.0-pkg-config.patch
new file mode 100644
index 00000000..5f0305f3
--- /dev/null
+++ b/dev-libs/libconcord/files/libconcord-1.0-pkg-config.patch
@@ -0,0 +1,34 @@
+--- configure.ac.ori	2013-06-05 01:48:58.997813488 +0200
++++ configure.ac	2013-06-05 02:21:12.940046659 +0200
+@@ -1,21 +1,17 @@
+ AC_INIT([libconcord], [1.0], [bug-automake@gnu.org])
+ AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+ AC_CONFIG_MACRO_DIR([m4])
+-AC_PROG_LIBTOOL
++
++AM_PROG_AR
+ AC_PROG_CXX
+-a=1
+-AC_CHECK_HEADER(usb.h, [], [a=0])
+-AC_CHECK_LIB(usb, usb_init, [], [a=0])
+-if test $a == 0
+-then
+-	AC_MSG_ERROR([Error, libusb is missing!])
+-fi
+-AC_CHECK_HEADER(zzip/lib.h, [], [a=0])
+-AC_CHECK_LIB(zzip, zzip_dir_open, [], [a=0])
+-if test $a == 0
+-then
+-	AC_MSG_ERROR([Error, libzzip is missing!])
+-fi
++AC_PROG_LIBTOOL
++
++PKG_CHECK_MODULES([libusb], [libusb])
++CPPFLAGS="$CPPFLAGS $libusb_CFLAGS"
++
++PKG_CHECK_MODULES([zziplib], [zziplib])
++CPPFLAGS="$CPPFLAGS $zziplib_CFLAGS"
++
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_FILES([
+  Makefile
diff --git a/dev-libs/libconcord/libconcord-0.23.ebuild b/dev-libs/libconcord/libconcord-0.23.ebuild
deleted file mode 100644
index 7d8bc25b..00000000
--- a/dev-libs/libconcord/libconcord-0.23.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-MY_P="concordance-${PV}"
-
-DESCRIPTION="Library for programming the Logitech Harmony universal remote; part
-of the concordance project"
-HOMEPAGE="http://www.phildev.net/concordance/"
-SRC_URI="mirror://sourceforge/concordance/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="virtual/libusb"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_configure() {
-	# Debian bug 594615
-	epatch "${FILESDIR}"/${P}-flash.patch || die "patch failed"
-
-	econf || die "configure failed"
-}
-
-src_compile() {
-	emake DESTDIR="${D}" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ../Changelog ../LICENSE README
-	S="${S}/bindings/python"
-	cd "${S}"
-	python setup.py install --root="${D}"
-}
diff --git a/dev-libs/libconcord/libconcord-1.0.ebuild b/dev-libs/libconcord/libconcord-1.0.ebuild
new file mode 100644
index 00000000..e9bde7ef
--- /dev/null
+++ b/dev-libs/libconcord/libconcord-1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+inherit eutils autotools python-r1
+
+MY_P="concordance-${PV}"
+
+DESCRIPTION="Library for programming the Logitech Harmony universal remote"
+HOMEPAGE="http://www.phildev.net/concordance/"
+SRC_URI="mirror://sourceforge/concordance/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="python"
+
+DEPEND="virtual/libusb:0
+	dev-libs/zziplib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-pkg-config.patch"
+
+	eautoreconf
+}
+
+src_install() {
+	einstall
+
+	dodoc README
+	dodoc ../Changelog ../TODO
+
+	if use python ; then
+		cd "${S}/bindings/python"
+		python_foreach_impl python_domodule libconcord.py
+	fi
+}