[net-libs/libgcal] Improve ebuilds

4 files changed, 64 insertions, 27 deletions

diff --git a/net-libs/libgcal/Manifest b/net-libs/libgcal/Manifest
index 5869483df3..26f1055985 100644
--- a/net-libs/libgcal/Manifest
+++ b/net-libs/libgcal/Manifest
@@ -1,4 +1,4 @@
 DIST libgcal-0.9.5.tar.bz2 142360 RMD160 65d9b54679cb289e0251370172c82400fe965377 SHA1 c522ecb0b34771d23517629f99e3f2ded29252d5 SHA256 d371139b40f498590f078aaafa82dfab565cd5ded967e6b5e80e74c0d1153a76
-EBUILD libgcal-0.9.5.ebuild 625 RMD160 a6c147b9eab8c7cd86e36b193c948fa6962f1fdd SHA1 14d17b0418dcf176ff856a0e90a6feb264c99357 SHA256 94cdb06b4abe3420709a206e9073839e6738979eb70dffbae61b8d21ebaf691f
-EBUILD libgcal-9999.ebuild 611 RMD160 cc98fb29b0bb7ecd490756a719337dc8e981deff SHA1 90abc09f86056266c0cef071ce3d95db44fe0dc3 SHA256 00752361b0e8d711b127fb64e419df9046b3e843e20af1496c91754b3e009832
-MISC metadata.xml 308 RMD160 95ae000b67eadc44a11939e9e7b4bbf1cc0a105d SHA1 6f4fe24ec60b24c600874ea54e9542ebbd79fd19 SHA256 43936592b30622095f859c7db39c01219823faa66aa73c398694b0746508e1a6
+EBUILD libgcal-0.9.5.ebuild 978 RMD160 cd9c976aab2e1248d407c2507bf15a93ce78ac0d SHA1 7fbbc010dce9df455dd322533e2e3a5de19221d9 SHA256 7f262a84160939602fd844ff2b5707829f341ea7062ab765aa0ac21a042ebb51
+EBUILD libgcal-9999.ebuild 970 RMD160 3fca3646b424b1127964d94501e34ceafa4283d3 SHA1 994f18a61b3058872d98fccb3a939c6a1e9f34a5 SHA256 bbf484bd2c091b61e2b8a59cc014f3f9063a5813f285ab1fdc631f69cafb89fb
+MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
diff --git a/net-libs/libgcal/libgcal-0.9.5.ebuild b/net-libs/libgcal/libgcal-0.9.5.ebuild
index ea9b276cc4..be6d659437 100644
--- a/net-libs/libgcal/libgcal-0.9.5.ebuild
+++ b/net-libs/libgcal/libgcal-0.9.5.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="2"
 
-#inherit eutils git autotools
 inherit cmake-utils
 
 DESCRIPTION="C/C++ interface to the Google Data API"
@@ -12,21 +11,44 @@ HOMEPAGE="http://code.google.com/p/libgcal/"
 SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="curldebug test"
+IUSE="debug doc test"
 
-DEPEND="
+# Some tests fail
+RESTRICT="test"
+
+RDEPEND="
 	dev-libs/libxml2:2
 	>=net-misc/curl-7.18.2
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+"
+
+DOCS=(README)
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(cmake-utils_use curldebug CURL_DEBUG)
+		-DENABLE_TESTS=OFF
+		$(cmake-utils_use debug CURL_DEBUG)
 	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile docs
+}
+
+src_install() {
+	use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/docs/doxygen/html/")
+	cmake-utils_src_install
+}
 
+src_test() {
+	mycmakeargs+=(-DENABLE_TESTS=ON)
 	cmake-utils_src_configure
+	cmake-utils_src_make test
 }
diff --git a/net-libs/libgcal/libgcal-9999.ebuild b/net-libs/libgcal/libgcal-9999.ebuild
index b0b890bf01..8bdac67bc4 100644
--- a/net-libs/libgcal/libgcal-9999.ebuild
+++ b/net-libs/libgcal/libgcal-9999.ebuild
@@ -4,33 +4,51 @@
 
 EAPI="2"
 
-inherit eutils git autotools
+inherit cmake-utils git
 
 DESCRIPTION="C/C++ interface to the Google Data API"
 HOMEPAGE="http://code.google.com/p/libgcal/"
-EGIT_REPO_URI="git://repo.or.cz/libgcal.git"
+EGIT_REPO_URI="git://gitorious.org/libgcal/libgcal.git"
 
 LICENSE="BSD"
-SLOT="0"
 KEYWORDS=""
-IUSE="curldebug debug"
+SLOT="0"
+IUSE="debug doc test"
+
+# Some tests fail
+RESTRICT="test"
 
-DEPEND="
+RDEPEND="
 	dev-libs/libxml2:2
 	>=net-misc/curl-7.18.2
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-libs/check )
+"
 
-src_prepare() {
-	eautoreconf -i -f
-}
+DOCS=(README)
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable curldebug)
+	mycmakeargs=(
+		-DENABLE_TESTS=OFF
+		$(cmake-utils_use debug CURL_DEBUG)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile docs
 }
 
 src_install() {
-	einstall || die "einstall failed"
+	use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/docs/doxygen/html/")
+	cmake-utils_src_install
+}
+
+src_test() {
+	mycmakeargs+=(-DENABLE_TESTS=ON)
+	cmake-utils_src_configure
+	cmake-utils_src_make test
 }
diff --git a/net-libs/libgcal/metadata.xml b/net-libs/libgcal/metadata.xml
index 8e8581ece8..616f0488f7 100644
--- a/net-libs/libgcal/metadata.xml
+++ b/net-libs/libgcal/metadata.xml
@@ -5,7 +5,4 @@
 <maintainer>
 	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
-<use>
-	<flag name='curldebug'>Enables debugging of curl usage</flag>
-</use>
 </pkgmetadata>