projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c1a1d6d)
Add multilib support (bug #514006, thanks to Karl Lindén and tokiclover). Fix pthread...
authorAlexandre Rostovtsev <tetromino@gentoo.org>
Sun, 22 Mar 2015 21:37:03 +0000 (21:37 +0000)
committerAlexandre Rostovtsev <tetromino@gentoo.org>
Sun, 22 Mar 2015 21:37:03 +0000 (21:37 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

dev-libs/dbus-c++/ChangeLog patch | blob | history
dev-libs/dbus-c++/Manifest patch | blob | history
dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild patch | blob | history
dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild [new file with mode: 0644] patch | blob

diff --git a/dev-libs/dbus-c++/ChangeLog b/dev-libs/dbus-c++/ChangeLog
index f0121fd9ef51d8c038390f462bc0f068941de96c..6a9c700625898735c38b3e851f210d8733492265 100644 (file)
--- a/dev-libs/dbus-c++/ChangeLog
+++ b/dev-libs/dbus-c++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/dbus-c++
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-c++/ChangeLog,v 1.7 2014/02/16 10:34:54 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-c++/ChangeLog,v 1.8 2015/03/22 21:36:55 tetromino Exp $
+
+*dbus-c++-0.9.0-r2 (22 Mar 2015)
+
+  22 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  dbus-c++-0.9.0-r1.ebuild, +dbus-c++-0.9.0-r2.ebuild:
+  Add multilib support (bug #514006, thanks to Karl Lindén and tokiclover).
+  Fix pthread linking weirdness. Fix USE=doc. Update license.
 
   16 Feb 2014; Pacho Ramos <pacho@gentoo.org> -dbus-c++-0.6.0_p20111126.ebuild,
   -dbus-c++-0.9.0.ebuild, metadata.xml:
diff --git a/dev-libs/dbus-c++/Manifest b/dev-libs/dbus-c++/Manifest
index 2b6b39de471a1d90217a06ad80de4a6d4a35a61f..63caa65ef7b1eff330e4df4186a31a75e242a1c0 100644 (file)
--- a/dev-libs/dbus-c++/Manifest
+++ b/dev-libs/dbus-c++/Manifest
@@ -3,13 +3,26 @@ Hash: SHA256
 
 AUX dbus-c++-0.9.0-gcc-4.7.patch 1073 SHA256 4f1c7633d224da33dcfb0b10f19ac1656df09d757152909d1f6b04b66ffa8c67 SHA512 3625f7473db8ee069009655f5c8b68bd7290d622be56ace8e1472bd93b0a946a000bf0d728839cd6309414cbcb925247bfee888bb58fda8316e906fe5a8e25b2 WHIRLPOOL cde935b6c7eb148e1221f1a3137fe24dd53543d27f81694a240f565d205dd1999cb99aaa4c99a8d1202648282e002300ab6b9e69796dd0d1c4266acb7ba011ef
 DIST libdbus-c++-0.9.0.tar.gz 466362 SHA256 bc11ac297b3cb010be904c72789695543ee3fdf3d75cdc8225fd371385af4e61 SHA512 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319 WHIRLPOOL 71df5476368591aa289ee35e5b5eacf6f9322bc5fb6c0180f18ff4deac28700d4903b54ac8a0208600062e147f7ae50c0865f7c1cb71a0b2219377120f73ffab
-EBUILD dbus-c++-0.9.0-r1.ebuild 1085 SHA256 713a11d4e4ded0091c7162c6296331174089dfcb602b71c6f3c8aa1dcc4ebe07 SHA512 ea70b628f20354eb1229700186c4da1ab00679587beab48098c175d3f82b0457a0c678d9166222549cacb06b7a06e1da8f119928208ceb21fc542f4e8230c068 WHIRLPOOL d14c5d0cd93837bb4183c09c8e478faf59315ca06765b872add7a0b8ea7943e0c9f8f9afaeba7772f3dc6d1186239b3242090e3b5fd967835dd5e3822d5d2084
-MISC ChangeLog 1344 SHA256 78deefc5a22e04cb0f0c99a053e938b16b9ebef7f7d23249355fbfbdd4763fde SHA512 8b0c2b18b5598b4a065152d1571df6a590b0c241de7fe722fd974269748954523e8bdc4d951daa3f3801ddbc2b8b4a7cfbfae493f26c4effa1e8e5fa12d2ba4d WHIRLPOOL 630dc670171c9e4c0f410fcd2dca3610599b0c6402c090dea9d6d85d186bb51578919cfbe06708fa8b3647dcef1b74b5507ca226c19ff2ece9ec9ad36d9c9c3e
+EBUILD dbus-c++-0.9.0-r1.ebuild 1098 SHA256 423e5d8c627a3fe6979a839b1afd6bfad0dfdfbb662d50d830bbd5909ff3f8e4 SHA512 b1d2607eb6df8ea0f4fa9f1d307e8f3b44ae3f4563bfc37f8e932ba1106a0bc5a5ac25c74d55ac63868728bb334992dee2846478a8ad5ee4dd65f8594fbf121a WHIRLPOOL a30e09c5f8ac6b8789126599a9b89de08c74221c1361a7d20461dee2c4ee39f67f1c1cd2a423d52ea1e081f2e3b6d9b28f38e23a63bee726cc89f2e74e3f05c4
+EBUILD dbus-c++-0.9.0-r2.ebuild 1741 SHA256 9b93449b3339bcf958629df383396e0b656dbb3861afdc4eba7c66aa63506e3b SHA512 9edd4ed32728dca596d7c2247ce1f04b6ffc3d4061e6279277e9d2160559c776940b8d2b0da1bd2acf944a8e066880596f3219aa1671896a122c629598d835ff WHIRLPOOL 113016f9313cf7cc0da92e02b8d35519699f27e6f24b8daf4faa8984d037fe7eb308681d9cc53eb166ce13f3f7ec0703636fd719970039735d67481673d028f2
+MISC ChangeLog 1636 SHA256 347d80fcd211d7d006769fb5b2c9b0e744de56cd48be857e0864f36f42bf0a99 SHA512 7b1b972661d512be5648693cfdaf90701342121743bde6edcee39e640cc0545352305f2a5a349ec6fe23ee3e84f0286562eaa3f024e53117b1861ba31d792c26 WHIRLPOOL 028dbf448dcd9fab9dc3ed5b8bdc5d9bf1e3c163ee01c8f1d7036cd2963564b8e5fd8c47b575695fbc0790304fa4038ac07820f4619191f26d2516f54f633856
 MISC metadata.xml 418 SHA256 f3227500125d3183a2c14c415619e5aaa94b9666ede996e36c217fc8e6caa65b SHA512 c245960d2a053b9bc4f50c84a9249c748e01dbef08ee9af27e54c890ca0a7096167a34e681df545b33fc6357ac24ab2f16216e83a178137355231fa530ba6904 WHIRLPOOL a8131a75d0917138152f86f3320ecfe8d3051eca7a07375b0ec04b311b9254cadff72f19caab168c956eda9b5fdd07bf2bf877d7ee7d0a90714cf764fee09174
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlMAlE8ACgkQCaWpQKGI+9Ra3QCfYrQy+O0RLFSBGd5njMPQ+KRC
-MTgAn0LzJhKBuLV1yklFE15K58uL/Vvo
-=v3M4
+iQJ8BAEBCABmBQJVDzX5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNNv8P/1I07b2q3dmQWy2MGKl97kp8
+dqvAyWN3jtoYTIvRQsIwdbxNWMKlS/47S7SPl2e0Ztlq/Z3nL0N/C20VEYp0rPbd
+Fn6WiSHPJiH2ofoUcbsuMzsttcu1ihBIJL4utqiECFZfxqm7TnCRyx2sIp4cG0e+
+gnbekw7waq+14ekhIrgEmzt1+grUDUtP5PYykJ3mbfXH/DC0eD2m1pUiqHquVBUL
+K69o+OSmYNP4mNFCyXI8nwOzLhpPDx6yK/49L3WnXYA+YTs5NvFgHE2H3Iecvxe+
+yr/Aj/hXo5SD8Ptpqks5dui90HmHg2RLeeBb+cjxcaqhVsr8NB1HqZMU/1RlnIFT
+sI709XgMxxtjFp96YWePI0yD4IRRaCVynwqsF+s+OVChNgTRJMCfPlZvasvyNsMH
+qwSeYPSjGOunEF9BA6ELRg73oHKI7gAp8jZqYNhamodCqgtmsptW1gEWKsvLM+Pv
+fl6BWdLtmoQnw7cCdyZeFbpj0J95bEgYHX81izm1Vaq4u6VKM8eWG7bVdfc6K51z
+d00z61zX5TVVRH3i5zbKyX3NMDbhAycVcm9Y6tDwjdfg4qem3liYeIvydkE9wfCY
+7LrgaU4f06hFa0WzU2b/I9brenj4Z7zXcQQM17P2Z1RSdzNewPl2vA5sJSLDQQ4Y
+JN8htedCRxk71iDWkCpY
+=Q/8X
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild
index c39793c3a9c784ce59f915dad038cd798a7a9772..58a8bf23a716fdcf42af5eacb0a381eb0e424c9f 100644 (file)
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild,v 1.2 2013/04/24 08:25:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild,v 1.3 2015/03/22 21:36:55 tetromino Exp $
 
 EAPI="4"
 
 inherit eutils
 
-DESCRIPTION="provide a C++ API for D-BUS"
+DESCRIPTION="Provides a C++ API for D-BUS"
 HOMEPAGE="http://sourceforge.net/projects/dbus-cplusplus/ http://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page"
 SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="doc ecore glib static-libs test"
 
 RDEPEND="sys-apps/dbus
        ecore? ( dev-libs/ecore )
-       glib? ( dev-libs/glib )"
+       glib? ( dev-libs/glib:2 )"
 DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )
        dev-util/cppunit
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild
new file mode 100644 (file)
index 0000000..38b7f38
--- /dev/null
+++ b/dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-c++/dbus-c++-0.9.0-r2.ebuild,v 1.1 2015/03/22 21:36:55 tetromino Exp $
+
+EAPI="5"
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
+
+inherit autotools-multilib
+
+DESCRIPTION="Provides a C++ API for D-BUS"
+HOMEPAGE="http://sourceforge.net/projects/dbus-cplusplus/ http://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page"
+SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc ecore glib static-libs test"
+
+RDEPEND="sys-apps/dbus[${MULTILIB_USEDEP}]
+       ecore? ( dev-libs/ecore )
+       glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+       doc? ( app-doc/doxygen )
+       dev-util/cppunit[${MULTILIB_USEDEP}]
+       virtual/pkgconfig"
+
+S=${WORKDIR}/lib${P}
+
+PATCHES=(
+       "${FILESDIR}"/${P}-gcc-4.7.patch #424707
+)
+
+multilib_src_configure() {
+       # not just using autotools-multilib_src_configure because of multilib_native... logic
+
+       # TODO : add ecore multilib support if/when it is multilibified
+       ECONF_SOURCE="${S}" econf \
+               --disable-examples \
+               $(multilib_native_use_enable doc doxygen-docs) \
+               $(multilib_native_use_enable ecore) \
+               $(use_enable glib) \
+               $(use_enable static-libs static) \
+               $(use_enable test tests) \
+               PTHREAD_LIBS=-lpthread
+       # ACX_PTHREAD sets PTHREAD_CFLAGS but not PTHREAD_LIBS for some reason...
+
+       if multilib_is_native_abi; then
+               # docs don't like out-of-source builds
+               local d
+               for d in img html; do
+                       ln -s "${S}"/doc/${d} "${BUILD_DIR}"/doc/${d} || die
+               done
+       fi
+}
+
+multilib_src_install_all() {
+       einstalldocs
+
+       if use doc; then
+               dohtml -r "${S}"/doc/html/*
+       fi
+}
+
Unnamed repository; edit this file 'description' to name the repository.