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

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

6 files changed, 74 insertions, 77 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/Manifest b/app-pda/libopensync-plugin-irmc/Manifest
index 4fde595ef626..45ed5a17d634 100644
--- a/app-pda/libopensync-plugin-irmc/Manifest
+++ b/app-pda/libopensync-plugin-irmc/Manifest
@@ -1,5 +1,15 @@
-DIST libopensync-plugin-irmc-0.36.tar.bz2 50009 RMD160 e180f1de51574495ca84aba868c5c5b0ade0446a SHA1 717bf898fd561c1ce918d15ddd5e9f0a920aa233 SHA256 f7ccff0bc136d3aa21ab961f31414f4856a94e9f1a1b17c44c8ec33b67ace4ac
-EBUILD libopensync-plugin-irmc-0.36.ebuild 1069 RMD160 7be8b650d857ef922bb0e5d00a447ab5cb91413b SHA1 5b29da2c682a6f1a21d89a1b5f1b2d4aa77be32b SHA256 3d43b1147d8d51d5308488075a08bc48e1fb76f811be1e73acb23a1e9cd34255
-EBUILD libopensync-plugin-irmc-9999.ebuild 1805 RMD160 dee167369e996119e3914da757e046eba9171cf8 SHA1 84c0cec9b0652f5a1f3f7d1bcf327b8eac5edf80 SHA256 ac10abf1f1067a7ecf829973a3e7cea35a8debe24c7a90ebbdc0814714d97c1b
-MISC ChangeLog 3022 RMD160 cc23f2f61c8bdcba025f54eb5f78eed392714d40 SHA1 60e6aaee3c49ac42ede5968a9fb8f7e6ddbad821 SHA256 f8e7bd5d5dee9856d5f95447d7c5c3549985506a83c3d76c76098e8101257d36
-MISC metadata.xml 311 RMD160 bf833b4a50292e79a7610046734ebffec50d4e04 SHA1 7885b7b08f01559298cbab85667ded2a98d2f8d0 SHA256 4d28d2cd19d82714eb96407193c09e021f2d2d5d2e8a178405cb9e9a64ade8a5
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libopensync-plugin-irmc-0.22.tar.bz2 244648 RMD160 c342c57b10e97bffac8c16612bef09c30b55e283 SHA1 554aea9fbd46af4f85fcd1257c5d44074c75ffb2 SHA256 4bed935f596bd5ae11f6263a97e3cd25029a911f7e476e9b8f11b8036d89a0f6
+EBUILD libopensync-plugin-irmc-0.22.ebuild 915 RMD160 a6b1bbb319209f48d0c3086b09055414674ca6f5 SHA1 a82de8be41f8c4d57b07799b6aaa12b0258dfe95 SHA256 682d8c25439ae4872f3cdc665a40004fb55cc85558c004c4c3f0226e3eadf9ff
+EBUILD libopensync-plugin-irmc-9999.ebuild 904 RMD160 c6768e126ac16278826e2958557723edd5f93d01 SHA1 f8946f9783f729d59f0b9d778aed21b339314d14 SHA256 9169314dd2e096584352f07297663eec27737d930d0e4fe8759f4a9a25400b7c
+MISC ChangeLog 3270 RMD160 d88e1067ca9ef65e2764aeb1228097b1d1712588 SHA1 4a7071a8adfb510af1f3c777e6d9f898dc376720 SHA256 1cf74c59773a97c5adf975ef7c6093143c71714c4aa01801e47ec589a5fdf294
+MISC metadata.xml 310 RMD160 31e74096be373ef12f23c444e37bca960caa8fed SHA1 4bd30ad382e730f9de869d3c638203ecf6b45a2a SHA256 28d716c86ef92bc2628157fd56060851d279efe11ab8c13fff4d57e969ddf2b9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2Ef6AACgkQiqiDRvmkBmLwsQCglaEvglkrC6T3OvSHqCmAL+/E
+SScAoK6GEwujsy3RZucAMtwAOxVwD2S6
+=cv/Y
+-----END PGP SIGNATURE-----
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>