dev-libs/libconcord: Version bump

Package-Manager: portage-2.2.10

5 files changed, 90 insertions, 82 deletions

diff --git a/dev-libs/libconcord/ChangeLog b/dev-libs/libconcord/ChangeLog
index 4dee6585..9c93b176 100644
--- a/dev-libs/libconcord/ChangeLog
+++ b/dev-libs/libconcord/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for dev-libs/libconcord
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*libconcord-1.1 (12 Apr 2014)
+
+  12 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> +libconcord-1.1.ebuild,
+  -files/libconcord-1.0-pkg-config.patch, -libconcord-1.0.ebuild:
+  dev-libs/libconcord: Version bump
+
   02 Dec 2013; Bertrand Jacquin <beber@meleeweb.net> libconcord-1.0.ebuild:
   dev-libs/libconcord: Remove unsupported python versions
 
diff --git a/dev-libs/libconcord/Manifest b/dev-libs/libconcord/Manifest
index 388c5ba2..4a75ddaa 100644
--- a/dev-libs/libconcord/Manifest
+++ b/dev-libs/libconcord/Manifest
@@ -1,5 +1,4 @@
-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 816 SHA256 a69d3a6566c7433b91ec3b77ee780c5a39e1745e72fcbe4e9e8663ba87dcc7be WHIRLPOOL 3f9f042bde527d7a3f49ff23ecb9c832db2b00ae8ec7929b58a246df698ce7e3ee6cc26fe9ca0cbda58e4d8439f1f04b555e42b75195d6e784c87b1aa6472fab
-MISC ChangeLog 1515 SHA256 795955433edeaa35a1b121ab300ba8906f589a3353b7d733a1449d1b9c9caefa WHIRLPOOL dcbed83ff767cd084145ad542ee90220775597294e60f30bbc4a55d3a1c0eb980802b83ae1125a3311c7e82dad5144fb27a1c9bd20332b8fc4f602bdc698cf46
+DIST concordance-1.1.tar.bz2 1142393 SHA256 ca5ffbd8c0fd06d41192c1d5e3c8b964c2393ea6d3d9c5e495c1da4b2c778a05 WHIRLPOOL 9a667a342a130d6b947657fa15361bb18e7a77860cc2e968ee9b30af641ff5ee409dd73ad70bcf9908f16e932c26a17cd2c7ea7aef40cdc9ed82f6d6e65c0ef3
+EBUILD libconcord-1.1.ebuild 1477 SHA256 d3c44be8658f3cd5130c001fa64afacb2622ed688d6a66eacc8ebe5306e9af12 WHIRLPOOL f3d1e497ddbfeabe09f0a3422c5e364091e5377fc20141f55cfbbbf62978d75f4b93dba60e09b32564bc960e5400537764c1c1612358e505305d435170c0b4b7
+MISC ChangeLog 1726 SHA256 d6c6145edd9ec85540d530e9bf61fe1d336f05d8428041da24d6385aad920176 WHIRLPOOL 6e6a77aac7a569c9dc5b75b81a265ee461a4e3a71aed4997b36c9fd0ed36b5f57a031177560124ef1dbaced1d71604e166d26d9d7ecf7a8aec52ac4b136244e0
 MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/dev-libs/libconcord/files/libconcord-1.0-pkg-config.patch b/dev-libs/libconcord/files/libconcord-1.0-pkg-config.patch
deleted file mode 100644
index 5f0305f3..00000000
--- a/dev-libs/libconcord/files/libconcord-1.0-pkg-config.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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-1.0.ebuild b/dev-libs/libconcord/libconcord-1.0.ebuild
deleted file mode 100644
index 5bc2bc95..00000000
--- a/dev-libs/libconcord/libconcord-1.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-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
-}
diff --git a/dev-libs/libconcord/libconcord-1.1.ebuild b/dev-libs/libconcord/libconcord-1.1.ebuild
new file mode 100644
index 00000000..232510bd
--- /dev/null
+++ b/dev-libs/libconcord/libconcord-1.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit eutils fdo-mime perl-module distutils-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="perl python static-libs"
+
+DEPEND="dev-libs/hidapi
+	dev-libs/libzip
+	perl? ( dev-lang/swig:0 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}/${PN}"
+
+src_prepare() {
+	if use perl ; then
+		cd "${S}/bindings/perl"
+		einfo "Prepare perl bindings in ${PWD}"
+		perl-module_src_prep
+		swig -perl5 concord.i
+		cd "${S}"
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-mime-update \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+
+	if use perl ; then
+		cd "${S}/bindings/perl"
+		einfo "Compile perl bindings in ${PWD}"
+		perl-module_src_compile
+		cd "${S}"
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${ED}"
+
+	dodoc README
+	dodoc ../Changelog ../TODO
+
+	if use perl ; then
+		cd "${S}/bindings/perl"
+		einfo "Install perl bindings in ${PWD}"
+		perl-module_src_install
+		cd "${S}"
+	fi
+
+	if use python ; then
+		cd "${S}/bindings/python"
+		einfo "Install python bindings in ${PWD}"
+		distutils-r1_src_install
+		cd "${S}"
+	fi
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}