From 1e5b7916b843576222592b2e8ae8c83a73da85f8 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Sat, 28 Apr 2007 16:56:36 +0000 Subject: [PATCH] Fix *initd, *confd and *envd calls (#17388, #174266) Package-Manager: portage-2.1.2.5 --- x11-libs/kylixlibs3-borqt/ChangeLog | 6 +++++- x11-libs/kylixlibs3-borqt/kylixlibs3-borqt-3.0-r1.ebuild | 7 +++---- x11-libs/qt-embedded/ChangeLog | 5 ++++- x11-libs/qt-embedded/qt-embedded-3.3.8.ebuild | 5 ++--- x11-libs/qt/ChangeLog | 6 +++++- x11-libs/qt/qt-3.3.4-r8.ebuild | 5 ++--- x11-libs/qt/qt-3.3.8-r2.ebuild | 5 ++--- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/x11-libs/kylixlibs3-borqt/ChangeLog b/x11-libs/kylixlibs3-borqt/ChangeLog index 00760a26c1bc..7561e2a78c64 100644 --- a/x11-libs/kylixlibs3-borqt/ChangeLog +++ b/x11-libs/kylixlibs3-borqt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/kylixlibs3-borqt # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/kylixlibs3-borqt/ChangeLog,v 1.10 2007/02/21 23:59:09 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/kylixlibs3-borqt/ChangeLog,v 1.11 2007/04/28 16:53:43 swegener Exp $ + + 28 Apr 2007; Sven Wegener + kylixlibs3-borqt-3.0-r1.ebuild: + Fix *initd, *confd and *envd calls (#17388, #174266) 21 Feb 2007; Markus Ullmann ChangeLog: Redigest for Manifest2 diff --git a/x11-libs/kylixlibs3-borqt/kylixlibs3-borqt-3.0-r1.ebuild b/x11-libs/kylixlibs3-borqt/kylixlibs3-borqt-3.0-r1.ebuild index 8f20681bd286..df2da8d0b81b 100644 --- a/x11-libs/kylixlibs3-borqt/kylixlibs3-borqt-3.0-r1.ebuild +++ b/x11-libs/kylixlibs3-borqt/kylixlibs3-borqt-3.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/kylixlibs3-borqt/kylixlibs3-borqt-3.0-r1.ebuild,v 1.6 2006/10/28 12:22:08 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/kylixlibs3-borqt/kylixlibs3-borqt-3.0-r1.ebuild,v 1.7 2007/04/28 16:53:43 swegener Exp $ S=${WORKDIR}/${PN} DESCRIPTION="Kylix 3 OE libraries" @@ -26,6 +26,5 @@ src_install () { dodoc README echo "LDPATH=/opt/kylix3" > 99kylixlibs - insinto /etc/env.d - doins 99kylixlibs + doenvd 99kylixlibs } diff --git a/x11-libs/qt-embedded/ChangeLog b/x11-libs/qt-embedded/ChangeLog index 29744a8987ea..4186eaaa1ffa 100644 --- a/x11-libs/qt-embedded/ChangeLog +++ b/x11-libs/qt-embedded/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt-embedded # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.22 2007/04/22 11:48:33 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/ChangeLog,v 1.23 2007/04/28 16:56:09 swegener Exp $ + + 28 Apr 2007; Sven Wegener qt-embedded-3.3.8.ebuild: + Fix *initd, *confd and *envd calls (#17388, #174266) 22 Apr 2007; Caleb Tennis -qt-embedded-3.3.4.ebuild, -qt-embedded-3.3.4-r1.ebuild, -qt-embedded-3.3.7.ebuild, diff --git a/x11-libs/qt-embedded/qt-embedded-3.3.8.ebuild b/x11-libs/qt-embedded/qt-embedded-3.3.8.ebuild index 0ab41ca3a582..7d9dad2ca433 100644 --- a/x11-libs/qt-embedded/qt-embedded-3.3.8.ebuild +++ b/x11-libs/qt-embedded/qt-embedded-3.3.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.8.ebuild,v 1.1 2007/04/22 11:48:33 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-embedded/qt-embedded-3.3.8.ebuild,v 1.2 2007/04/28 16:56:09 swegener Exp $ DESCRIPTION="Embedded Linux port of Qt" HOMEPAGE="http://www.trolltech.com/products/embedded/" @@ -113,8 +113,7 @@ PATH=${QTBASE}/bin ROOTPATH=${QTBASE}/bin LDPATH=${QTBASE}/lib EOF - insinto /etc/env.d - doins ${T}/47qt-embedded3 + doenvd ${T}/47qt-embedded3 # qmake cache file sed -i -e "s:${S}:${QTBASE}:" .qmake.cache diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index e27c828917ed..19dda38cde5d 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.436 2007/04/20 16:41:43 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.437 2007/04/28 16:56:36 swegener Exp $ + + 28 Apr 2007; Sven Wegener qt-3.3.4-r8.ebuild, + qt-3.3.8-r2.ebuild: + Fix *initd, *confd and *envd calls (#17388, #174266) 20 Apr 2007; Caleb Tennis qt-3.3.4-r8.ebuild: re-add x86 because this is the preferred hardened version for x86 diff --git a/x11-libs/qt/qt-3.3.4-r8.ebuild b/x11-libs/qt/qt-3.3.4-r8.ebuild index 416f47751dc6..f92f14ff21ea 100644 --- a/x11-libs/qt/qt-3.3.4-r8.ebuild +++ b/x11-libs/qt/qt-3.3.4-r8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.24 2007/04/20 16:41:43 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r8.ebuild,v 1.25 2007/04/28 16:56:36 swegener Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -301,8 +301,7 @@ EOF SEARCH_DIRS="${QTBASE}" EOF - insinto /etc/env.d - doins ${T}/45qt3 ${T}/50qtdir3 + doenvd ${T}/45qt3 ${T}/50qtdir3 insinto /etc/revdep-rebuild doins ${T}/50-qt3-revdep diff --git a/x11-libs/qt/qt-3.3.8-r2.ebuild b/x11-libs/qt/qt-3.3.8-r2.ebuild index 4b10dab0826c..89492da4865a 100644 --- a/x11-libs/qt/qt-3.3.8-r2.ebuild +++ b/x11-libs/qt/qt-3.3.8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r2.ebuild,v 1.8 2007/04/18 17:23:12 yoswink Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r2.ebuild,v 1.9 2007/04/28 16:56:36 swegener Exp $ # *** Please remember to update qt3.eclass when revbumping this *** @@ -334,8 +334,7 @@ EOF insinto /etc/revdep-rebuild doins ${T}/50-qt3-revdep - insinto /etc/env.d - doins ${T}/45qt3 ${T}/50qtdir3 + doenvd ${T}/45qt3 ${T}/50qtdir3 if [ "${SYMLINK_LIB}" = "yes" ]; then dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib -- 2.26.2