[gentoo-commits] dev/dev-zero:master commit in: dev-libs/dbus-c++/, dev-libs/dbus-cpp/

[gentoo-commits] dev/dev-zero:master commit in: dev-libs/dbus-c++/, dev-libs/dbus-cpp/

[Tiziano Müller]

commit:     dd33fe029a89a1839ebd5325d4243983c2627992
Author:     Tiziano Müller <tm <AT> dev-zero <DOT> ch>
AuthorDate: Wed Feb  8 13:21:36 2012 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 13:21:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=dd33fe02

Renamed dbus-cpp to dbus-c++ to match what's in gentoo-x86 (as it is now the same upstream). Bump to 0.9.

---
 dev-libs/dbus-c++/Manifest                         |    3 +++
 .../dbus-c++-0.9.0.ebuild}                         |   18 ++++++------------
 .../dbus-c++-scm.ebuild}                           |   12 ++++--------
 dev-libs/dbus-cpp/Manifest                         |    1 -
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/dev-libs/dbus-c++/Manifest b/dev-libs/dbus-c++/Manifest
new file mode 100644
index 0000000..25fd651
--- /dev/null
+++ b/dev-libs/dbus-c++/Manifest
@@ -0,0 +1,3 @@
+DIST libdbus-c++-0.9.0.tar.gz 466362 RMD160 a82dda3a5c92d01c743bf31713c67de2506db107 SHA1 105bc04c9ad03c69e612a41e83acd04b7dfd3a41 SHA256 bc11ac297b3cb010be904c72789695543ee3fdf3d75cdc8225fd371385af4e61
+EBUILD dbus-c++-0.9.0.ebuild 967 RMD160 adf41e913aad9c45917b89399262e82e8a46b4b3 SHA1 1e9e3b814661fa80df27a69d540c2ce7f7c15a19 SHA256 917940bbf8a7215f56e8aa145673e7723c99a8a91248d7e90081375a54d35d67
+EBUILD dbus-c++-scm.ebuild 979 RMD160 bc15b26b92ce1e5fb086f48c8858a9b6aeb6e8e4 SHA1 2826ef0eee6caa6051df874137bfc617ce643511 SHA256 e0bfab79a973ad167e1aa48d8069c5b2d6ff2d7c719837a4cfe0c9211fcf8723

diff --git a/dev-libs/dbus-cpp/dbus-cpp-scm.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0.ebuild
similarity index 72%
copy from dev-libs/dbus-cpp/dbus-cpp-scm.ebuild
copy to dev-libs/dbus-c++/dbus-c++-0.9.0.ebuild
index 449c249..718f522 100644
--- a/dev-libs/dbus-cpp/dbus-cpp-scm.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit autotools git
+MY_P="lib${P}"
 
 DESCRIPTION="C++ interface library to dbus."
 HOMEPAGE="http://dbus-cplusplus.sourceforge.net/ http://gitorious.org/dbus-cplusplus/"
-EGIT_REPO_URI="git://gitorious.org/dbus-cplusplus/mainline.git"
+SRC_URI="mirror://sourceforge/dbus-cplusplus/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -24,12 +24,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-src_prepare() {
-	sed -i \
-		-e 's| -O3||' \
-		configure.ac || die "sed failed"
-	eautoreconf
-}
+S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	econf \
@@ -40,11 +35,10 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	use static-libs || rm "${D}"/usr/lib*/*.la
 
-	dodoc AUTHORS README TODO
 	use doc && dohtml -r doc/html/*
 
 	if use examples ; then

diff --git a/dev-libs/dbus-cpp/dbus-cpp-scm.ebuild b/dev-libs/dbus-c++/dbus-c++-scm.ebuild
similarity index 80%
rename from dev-libs/dbus-cpp/dbus-cpp-scm.ebuild
rename to dev-libs/dbus-c++/dbus-c++-scm.ebuild
index 449c249..e5f2e5a 100644
--- a/dev-libs/dbus-cpp/dbus-cpp-scm.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-scm.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 inherit autotools git
 
@@ -12,7 +12,7 @@ EGIT_REPO_URI="git://gitorious.org/dbus-cplusplus/mainline.git"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS=""
 IUSE="doc ecore examples glib static-libs"
 
 RDEPEND="sys-apps/dbus
@@ -25,9 +25,6 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
-	sed -i \
-		-e 's| -O3||' \
-		configure.ac || die "sed failed"
 	eautoreconf
 }
 
@@ -40,11 +37,10 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	use static-libs || rm "${D}"/usr/lib*/*.la
 
-	dodoc AUTHORS README TODO
 	use doc && dohtml -r doc/html/*
 
 	if use examples ; then

diff --git a/dev-libs/dbus-cpp/Manifest b/dev-libs/dbus-cpp/Manifest
deleted file mode 100644
index cf8ecc3..0000000
--- a/dev-libs/dbus-cpp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD dbus-cpp-scm.ebuild 1126 RMD160 8607a7ddc6e9fbbd58df353038e06a7ae7a2f157 SHA1 dabac661369dd60b13f76e71f7e943cfb6ac1914 SHA256 01e7d8c5ec34ad35b27adddf63622698ee8f3055c7de01026a69bea51ff63d20