Resurrect 0.22, port to EAPI 4, fix dependencies, etc. Drop 0.36.

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

5 files changed, 59 insertions, 72 deletions

diff --git a/app-pda/libopensync-plugin-irmc/ChangeLog b/app-pda/libopensync-plugin-irmc/ChangeLog
index 37c5470675e6..1312a95dcc20 100644
--- a/app-pda/libopensync-plugin-irmc/ChangeLog
+++ b/app-pda/libopensync-plugin-irmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/libopensync-plugin-irmc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-irmc/ChangeLog,v 1.15 2010/06/11 12:15:30 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-irmc/ChangeLog,v 1.16 2011/03/19 09:57:57 dirtyepic Exp $
+
+  19 Mar 2011; Ryan Hill <dirtyepic@gentoo.org>
+  +libopensync-plugin-irmc-0.22.ebuild, -libopensync-plugin-irmc-0.36.ebuild,
+  libopensync-plugin-irmc-9999.ebuild, metadata.xml:
+  Resurrect 0.22, port to EAPI 4, fix dependencies, etc. Drop 0.36.
 
   11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   libopensync-plugin-irmc-0.36.ebuild, libopensync-plugin-irmc-9999.ebuild:
diff --git a/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.22.ebuild b/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.22.ebuild
new file mode 100644
index 000000000000..5b8bc44200ff
--- /dev/null
+++ b/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.22.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.22.ebuild,v 1.4 2011/03/19 09:57:57 dirtyepic Exp $
+
+EAPI="4"
+
+DESCRIPTION="OpenSync IrMC plugin"
+HOMEPAGE="http://www.opensync.org/"
+SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="+bluetooth irda"
+
+REQUIRED_USE="|| ( bluetooth irda )"
+
+RDEPEND="~app-pda/libopensync-${PV}
+	dev-libs/glib:2
+	dev-libs/libxml2
+	>=dev-libs/openobex-1.0[bluetooth?,irda?]
+	bluetooth? ( net-wireless/bluez )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0"
+
+src_configure() {
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable irda)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+	dodoc AUTHORS README
+}
diff --git a/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.36.ebuild b/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.36.ebuild
deleted file mode 100644
index feb4bb12fd51..000000000000
--- a/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.36.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-0.36.ebuild,v 1.5 2010/06/11 12:15:30 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils cmake-utils
-
-DESCRIPTION="OpenSync IrMC plugin"
-HOMEPAGE="http://www.opensync.org/"
-SRC_URI="http://www.opensync.org/download/releases/${PV}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+bluetooth irda"
-
-DEPEND="=app-pda/libopensync-${PV}*
-	>=dev-libs/openobex-1.0[bluetooth?,irda?]
-	bluetooth? ( net-wireless/bluez )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! use irda && ! use bluetooth; then
-		eerror "${CATEGORY}/${P} without support for bluetooth nor irda is unusable."
-		eerror "Please enable \"bluetooth\" or/and \"irda\" USE flags."
-		die "Please enable \"bluetooth\" or/and \"irda\" USE flags."
-	fi
-}
-
-src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable bluetooth BLUETOOTH)
-		$(cmake-utils_use_enable irda IRDA)"
-
-	cmake-utils_src_configure
-}
diff --git a/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-9999.ebuild b/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-9999.ebuild
index e30e427f689c..1cd001ff2253 100644
--- a/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-9999.ebuild
+++ b/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-9999.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-9999.ebuild,v 1.5 2010/06/11 12:15:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-irmc/libopensync-plugin-irmc-9999.ebuild,v 1.6 2011/03/19 09:57:57 dirtyepic Exp $
+
+EAPI="4"
 
 inherit eutils cmake-utils subversion
 
@@ -15,34 +17,15 @@ SLOT="0"
 LICENSE="GPL-2"
 IUSE="bluetooth irda"
 
-DEPEND="=app-pda/libopensync-${PV}*
-	>=dev-libs/openobex-1.0
+REQUIRED_USE="|| ( bluetooth irda )"
+
+RDEPEND="~app-pda/libopensync-${PV}
+	dev-libs/glib:2
+	dev-libs/libxml2
+	>=dev-libs/openobex-1.0[bluetooth?,irda?]
 	bluetooth? ( net-wireless/bluez )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! use irda && ! use bluetooth; then
-		eerror "${CATEGORY}/${P} without support for bluetooth nor irda is unusable."
-		eerror "Please enable \"bluetooth\" or/and \"irda\" USE flags."
-		die "Please enable \"bluetooth\" or/and \"irda\" USE flags."
-	fi
-
-	if use bluetooth && ! built_with_use dev-libs/openobex bluetooth; then
-		eerror "You are trying to build ${CATEGORY}/${P} with the \"bluetooth\""
-		eerror "USE flag, but dev-libs/openobex was built without"
-		eerror "the \"bluetooth\" USE flag."
-		eerror "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
-		die "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
-	fi
-
-	if use irda && ! built_with_use dev-libs/openobex irda; then
-		eerror "You are trying to build ${CATEGORY}/${P} with the \"irda\""
-		eerror "USE flag, but dev-libs/openobex was built without"
-		eerror "the \"irda\" USE flag."
-		eerror "Please rebuild dev-libs/openobex with \"irda\" USE flag."
-		die "Please rebuild dev-libs/openobex with \"irda\" USE flag."
-	fi
-}
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9.0"
 
 src_compile() {
 	local mycmakeargs="
diff --git a/app-pda/libopensync-plugin-irmc/metadata.xml b/app-pda/libopensync-plugin-irmc/metadata.xml
index 42355fbb2397..60f4e48d5b69 100644
--- a/app-pda/libopensync-plugin-irmc/metadata.xml
+++ b/app-pda/libopensync-plugin-irmc/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 <herd>pda</herd>
 <maintainer>
-  <email>peper@gentoo.org</email>
-  <name>Piotr Jaroszyński</name>
+  <email>dirtyepic@gentoo.org</email>
+  <name>Ryan Hill</name>
 </maintainer>
 <use>
-  <flag name='irda'>Enable IrDA support</flag>
+  <flag name='irda'>Enable infrared support</flag>
 </use>
 </pkgmetadata>