[gentoo-commits] gentoo-x86 commit in dev-libs/ace: ChangeLog ace-5.6.5-r1.ebuild

[Tiziano Mueller (dev-zero)]

dev-zero    08/06/29 13:08:16

  Modified:             ChangeLog
  Added:                ace-5.6.5-r1.ebuild
  Log:
  Fixed headers installation (bug #229013, thanks to Matt Michalowski)
  (Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 x86_64)

Revision  Changes    Path
1.54                 dev-libs/ace/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/ace/ChangeLog?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/ace/ChangeLog?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/ace/ChangeLog?r1=1.53&r2=1.54

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ChangeLog	20 Jun 2008 14:21:27 -0000	1.53
+++ ChangeLog	29 Jun 2008 13:08:15 -0000	1.54
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/ace
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.53 2008/06/20 14:21:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ChangeLog,v 1.54 2008/06/29 13:08:15 dev-zero Exp $
+
+*ace-5.6.5-r1 (29 Jun 2008)
+
+  29 Jun 2008; Tiziano Müller <dev-zero@g.o> +ace-5.6.5-r1.ebuild:
+  Fixed headers installation (bug #229013, thanks to Matt Michalowski)
 
 *ace-5.6.5 (20 Jun 2008)
 



1.1                  dev-libs/ace/ace-5.6.5-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/ace/ace-5.6.5-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/ace/ace-5.6.5-r1.ebuild?rev=1.1&content-type=text/plain

Index: ace-5.6.5-r1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/ace/ace-5.6.5-r1.ebuild,v 1.1 2008/06/29 13:08:15 dev-zero Exp $

inherit toolchain-funcs

DESCRIPTION="The Adaptive Communications Environment"
HOMEPAGE="http://www.cs.wustl.edu/~schmidt/ACE.html"
SRC_URI="!tao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE-${PV}.tar.bz2 )
	tao? (
		!ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-${PV}.tar.bz2 )
		ciao? ( http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-${PV}.tar.bz2 )
	)"
LICENSE="BSD as-is"
SLOT="0"
KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
IUSE="X ipv6 tao ciao"

COMMON_DEPEND="dev-libs/openssl"
# TODO probably more
RDEPEND="${COMMON_DEPEND}
	X? ( x11-libs/libXt x11-libs/libXaw )"

DEPEND="${COMMON_DEPEND}
	X? ( x11-proto/xproto )"

S="${WORKDIR}/ACE_wrappers"

src_compile() {
	export ACE_ROOT="${S}"
	mkdir build
	cd build

	ECONF_SOURCE="${S}"
	econf \
		--enable-lib-all \
		$(use_with X) \
		$(use_enable ipv6) \
		|| die "econf died"
	# --with-qos needs ACE_HAS_RAPI
	emake static_libs=1 || die "emake failed"
}

src_install() {
	cd build
	emake ACE_ROOT="${S}" DESTDIR="${D}" install || die "failed to install"
	insinto /usr/include/ace
	doins \
		"${S}/ace/Svc_Conf_Token_Table.h" \
		"${S}/ace/Unbounded_Set_Ex.inl" \
		"${S}/ace/Unbounded_Set_Ex.h" \
		"${S}/ace/Unbounded_Set_Ex.cpp"
	# punt gperf stuff
	rm -rf "${D}/usr/bin" "${D}/usr/share"
}

src_test() {
	cd "${S}/build"
	emake ACE_ROOT="${S}" check || die "self test failed"
	sed -i -e "^#define PACKAGE_.*//g" /usr/include/ace/config.h
}

pkg_postinst() {

	local CC_MACHINE=$($(tc-getCC) -dumpmachine)
	if [ -d "/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" ]; then
	ewarn "moving /usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace to"
	ewarn "ace.old"
	ewarn "This is required, as anything trying to compile against ACE will"
	ewarn "have problems with conflicting OS.h files if this is not done."
		mv "/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace" \
			"/usr/$(get_libdir)/gcc-lib/${CC_MACHINE}/$(gcc-fullversion)/include/ace.old"
	fi
}



-- 
gentoo-commits@l.g.o mailing list