dev-libs/glibmm-2.{38.2-r1,40.0-r1}: revbump/merge

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

4 files changed, 232 insertions, 3 deletions

diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index dd5b44e..a690c31 100644
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,53 @@
 # ChangeLog for dev-cpp/glibmm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.205 2013/12/24 15:41:30 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.219 2014/04/27 18:29:14 eva Exp $
+
+*glibmm-2.40.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +glibmm-2.40.0.ebuild:
+  Version bump for Gnome 3.12.
+
+*glibmm-2.38.2 (27 Apr 2014)
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org> +glibmm-2.38.2.ebuild:
+  Version bump
+
+  23 Apr 2014; Pacho Ramos <pacho@gentoo.org> -glibmm-2.32.1.ebuild,
+  -glibmm-2.34.1.ebuild, -glibmm-2.36.2.ebuild:
+  Drop old
+
+  21 Apr 2014; Agostino Sarubbo <ago@gentoo.org> glibmm-2.38.1.ebuild:
+  Stable for arm, wrt bug #507568
+
+  19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> glibmm-2.38.1.ebuild:
+  Stable for sparc, wrt bug #507568
+
+  18 Apr 2014; Agostino Sarubbo <ago@gentoo.org> glibmm-2.38.1.ebuild:
+  Stable for alpha, wrt bug #507568
+
+  17 Apr 2014; Agostino Sarubbo <ago@gentoo.org> glibmm-2.38.1.ebuild:
+  Stable for ia64, wrt bug #507568
+
+  16 Apr 2014; Agostino Sarubbo <ago@gentoo.org> glibmm-2.38.1.ebuild:
+  Stable for ppc64, wrt bug #507568
+
+  14 Apr 2014; Agostino Sarubbo <ago@gentoo.org> glibmm-2.38.1.ebuild:
+  Stable for ppc, wrt bug #507568
+
+  28 Mar 2014; Jeroen Roovers <jer@gentoo.org> glibmm-2.38.1.ebuild:
+  Stable for HPPA (bug #499954).
+
+  09 Mar 2014; Pacho Ramos <pacho@gentoo.org> glibmm-2.38.1.ebuild:
+  x86 stable, bug 499954
+
+  09 Mar 2014; Pacho Ramos <pacho@gentoo.org> glibmm-2.38.1.ebuild:
+  amd64 stable, bug 499954
+
+  23 Feb 2014; Pacho Ramos <pacho@gentoo.org> glibmm-2.38.1.ebuild:
+  Revert wrong commit
+
+  22 Feb 2014; Pacho Ramos <pacho@gentoo.org> glibmm-2.38.1.ebuild:
+  arch stable, bug 888
 
 *glibmm-2.38.1 (24 Dec 2013)
 
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index fa49271..30046fd 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -1,6 +1,10 @@
 DIST glibmm-2.36.2.tar.xz 2309976 SHA256 f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf SHA512 afbbdb7c2001183e0c61a3a41b864aff0400a162067f945c1abcf7ac1b514c00993e0216fbfd5fa82d12045289bd584146853b557be7f6a2f94336c96d9e6d68 WHIRLPOOL dc694d5550f82f60dd68bd3e72f019767a3956d322ab4ebbca64037cbd264fd70945b9ab01a70b8ca6f8bebe75c4d61b97a92ff395c6b7e461096fbe69f524a5
 DIST glibmm-2.38.1.tar.xz 5701316 SHA256 49c925ee1d3c4d0d6cd7492d7173bd6826db51d0b55f458a6496406ae267c4a2 SHA512 f9f9b71cfc0f810452669a497eb215c1073fc9b9d63f94adb575d1e3cf8c11412378ae717c7425220a80e96f44095445290536e9667730b1dfc91624cfd263ba WHIRLPOOL eecbbd4812665c4d1330ed3f7dd73165966e4790a1e22d3f741e60cbc236c1fc25da796d9c1a18f6533d46c08dd35ee897cbd5e28e3d1367e97118fc476c39c2
+DIST glibmm-2.38.2.tar.xz 5598460 SHA256 908127c8128403d7813ae54fdc1ce026a842df0743b8eecca369e9411e702665 SHA512 7cb6d4be7e695e29ff78e2e2495c6c4605d1a6f6d213951a27dac79dfa1c145dd79ced4d034a195b66905ab1b21c3a034682bc48c9ccb472dd40022ba5050a65 WHIRLPOOL 6a5c3a512fe41bc4712df4ffe38c8db9671afb4c04f06c8311fc3852f071b10fa58a6350dfb2aa26a8b372bb15405725cdfe3d6323c09d1adfb4c51185f6689a
+DIST glibmm-2.40.0.tar.xz 5645840 SHA256 34f320fad7e0057c63863706caa802ae0051b21523bed91ec33baf8421ca484f SHA512 3a51b3e311ba59505b3c452afdfdf456f184c39651d81317ff62f942d309f8707306cc68c69c20f7534f585036086088159414c7e75de59ab2684c4850559cb9 WHIRLPOOL 876ac86023e41b281408bf5435e32cd7674c2db1f92910508a082c8b316651b9e612de431ff767bffe4cd0613bb03a040e7569198cf3dc607f572cbcf5198bb2
 EBUILD glibmm-2.36.2-r1.ebuild 1973 SHA256 c42499fe1d06f1dd47ef994526ec3585bb0ce75ae76e44173fe5c5e312ed2c18 SHA512 36f49d44c20324569ac198d314da35b75efbf272adbaef765d261b7b9515ba666aab7244fa43b61a5a5ef6d5f9a1e691ee145c1ee94a49d16ba1f82447bbc68b WHIRLPOOL 0a8414c2fdfa5e915aadc8bb7ecddc2c0982c45583301413f31ea9cbadda08aa39fe3a816751767775a3fe7c865fe3fcc18771b33f179e5d757ad3956dac5c18
 EBUILD glibmm-2.38.1-r1.ebuild 2104 SHA256 e4ec0eac448230ba44bf5c40f8e7db9d7500ed586713216e751b6c63441e3c45 SHA512 a24826dffa1e90ccb386f734011d142e163122e66c85416cb0d10d81639d0705864594a714bd792c7cd18f2b58aff64f0fcb911b4f4d9b4ec0fef92b7c031fcf WHIRLPOOL 17cb4ab5ab4754ff9c1ae00e493daff32752d96447e0eae8ab101a2bbb9570cca848b9b5ffbd452bca75e200774eb147e12f70e00cbe93c5db4f4c63f832b042
-MISC ChangeLog 25270 SHA256 c9c618ffb96efeed1da6febd95eb47ec13ed10a2deac416c41fa608fa6becc25 SHA512 c54d7a8384d72fd4b4e078ee8d88eab62ea7d718008e91433fc85e6c80eebbc64a727890edfb9749d88aa1170988ea7c7598acdec28d2821b92d2dde80943e30 WHIRLPOOL 1bdfa894056847e145fefb8daf9b5bb028940e0f21336092625e4aac8c8f17044e3dac9f43c6baf00a86271abb7cee68f8075a434a7ee36ed06813ea2479e441
+EBUILD glibmm-2.38.2-r1.ebuild 1973 SHA256 b3912ddbbb982fc5623bce1332ad0c42ce23b76186c4abf0fe1f28b578acbfa9 SHA512 b43ec4408d32dafb50c19ac2ba7d34d416545af8bf7ea9f1bf19b8abc69055c069de9431e905c79c6d8b1fd2e9ca8a4ac87ba1d4bbc380529603509eec31d5cb WHIRLPOOL fc7f8cc94569888beb8766fae8c1ee7a6af0c67e456d597d9b4ad4a919720a580420ddf78d4c6285c8377f002e352bb7fd4892413474adc97bc6559d80498b94
+EBUILD glibmm-2.40.0-r1.ebuild 1973 SHA256 9064fd1a3a74590b46b80c2e8502105854bc54fda0e207044506445f7315fbcc SHA512 01299ba993393ad8e9c619249b54ff3519f12dffa5dafbfb9ff701514770ce743d8a04ebb998096816e6224e326a1b45878ed9cc4094a04c3f55082ebb29fb0d WHIRLPOOL b445da3706661f663eb32575be8985ab9e56732ec6347b88e2d8dc1946d2891c5bb5325d06c50945af91ace094e13fe0878085857d8d14df39e158d41acf7485
+MISC ChangeLog 26770 SHA256 120b88c5e563dd7684600ce97256aae0bc0ebc6df0f7c7f624a48b9397e7f2a4 SHA512 d98974d9788c4932decc02cd9eaf54c1ec79db3f7e47293b22da10db7c29ab6a1390de0ed7b96cf9dc4681f685f7d580436d1f821d42e177b349577c5c053973 WHIRLPOOL c40f82c9ee59cc2d81fa37358de20c7d20f545f399553dca65485271bf3e9d1ba93973aa1ada4895c56fa0b2be0d5373a37cd7ec3443102f7d36df9d52141859
 MISC metadata.xml 161 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6 SHA512 22fe7471187a068f45de295adc5349f8f01d16d06562f8edfceb5dacb604d98b0e3cadc23f7d0b164f6429769b71961bc5d9088a41f1ca4a968e4be37ac6ef1b WHIRLPOOL 92db96c310438550f7073b19fb34f6d5d7e478b04b43bff8a2815374ce50c2fa7291018c4131d48face3f3f0a66e0a3d2a778c42550a1fbfedb386db48a4bf05
diff --git a/dev-cpp/glibmm/glibmm-2.38.2-r1.ebuild b/dev-cpp/glibmm/glibmm-2.38.2-r1.ebuild
new file mode 100644
index 0000000..860522e
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.38.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2-multilib
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE="doc debug examples test"
+
+RDEPEND="
+	>=dev-libs/libsigc++-2.2.10:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+# dev-cpp/mm-common needed for eautoreconf
+
+MULTILIB_PARALLEL_PHASES="src_configure src_compile src_test"
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
+			-i Makefile.am Makefile.in || die "sed 1 failed"
+	fi
+
+	if ! use examples; then
+		# don't waste time building examples
+		sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+			-i Makefile.am Makefile.in || die "sed 2 failed"
+	fi
+
+	gnome2-multilib_src_prepare
+}
+
+src_configure() {
+	gnome2-multilib_src_configure \
+		$(use_enable debug debug-refcounting) \
+		$(use_enable doc documentation) \
+		--enable-deprecated-api
+}
+
+ehook gnome2-multilib-per-abi-post_src_configure my_abi_post_configure
+my_abi_post_configure() {
+	# configure forgets to create these OOT
+	local d
+	if use examples ; then
+		for d in "${S}"/examples/* ; do
+			if [[ -d "${d}" ]]; then
+				mkdir "${d#${S}/}" || die "couldnt mkdir \"${d#${S}/}\" but [[ -d ${d} ]]."
+			fi
+		done
+	fi
+}
+
+src_test() {
+	multilib_foreach_abi multilib-build_run_in_build_dir testicles
+}
+
+testicles() {
+	cd tests
+	default
+	for i in */test; do
+		${i} || die "Running tests failed at ${i} for ABI ${ABI}"
+	done
+}
+
+src_install() {
+	gnome2-multilib_src_install
+
+	if ! use doc && ! use examples; then
+		rm -fr "${ED}usr/share/doc/glibmm*"
+	fi
+
+	if use examples; then
+		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+		dodoc -r examples
+	fi
+}
diff --git a/dev-cpp/glibmm/glibmm-2.40.0-r1.ebuild b/dev-cpp/glibmm/glibmm-2.40.0-r1.ebuild
new file mode 100644
index 0000000..72d8c6f
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.40.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2-multilib
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE="doc debug examples test"
+
+RDEPEND="
+	>=dev-libs/libsigc++-2.2.10:2[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+# dev-cpp/mm-common needed for eautoreconf
+
+MULTILIB_PARALLEL_PHASES="src_configure src_compile src_test"
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
+			-i Makefile.am Makefile.in || die "sed 1 failed"
+	fi
+
+	if ! use examples; then
+		# don't waste time building examples
+		sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+			-i Makefile.am Makefile.in || die "sed 2 failed"
+	fi
+
+	gnome2-multilib_src_prepare
+}
+
+src_configure() {
+	gnome2-multilib_src_configure \
+		$(use_enable debug debug-refcounting) \
+		$(use_enable doc documentation) \
+		--enable-deprecated-api
+}
+
+ehook gnome2-multilib-per-abi-post_src_configure my_abi_post_configure
+my_abi_post_configure() {
+	# configure forgets to create these OOT
+	local d
+	if use examples ; then
+		for d in "${S}"/examples/* ; do
+			if [[ -d "${d}" ]]; then
+				mkdir "${d#${S}/}" || die "couldnt mkdir \"${d#${S}/}\" but [[ -d ${d} ]]."
+			fi
+		done
+	fi
+}
+
+src_test() {
+	multilib_foreach_abi multilib-build_run_in_build_dir testicles
+}
+
+testicles() {
+	cd tests
+	default
+	for i in */test; do
+		${i} || die "Running tests failed at ${i} for ABI ${ABI}"
+	done
+}
+
+src_install() {
+	gnome2-multilib_src_install
+
+	if ! use doc && ! use examples; then
+		rm -fr "${ED}usr/share/doc/glibmm*"
+	fi
+
+	if use examples; then
+		find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+		dodoc -r examples
+	fi
+}