[gentoo-commits] gentoo-x86 commit in x11-libs/qt-core: qt-core-4.4.0_rc1.ebuild

[Caleb Tennis (caleb)]

caleb       07/12/24 15:06:14

  Modified:             qt-core-4.4.0_rc1.ebuild
  Log:
  If we already have a qconfig.pri on the system, don't overwrite it with a new one
  (Portage version: 2.1.4_rc11)

Revision  Changes    Path
1.7                  x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild?r1=1.6&r2=1.7

Index: qt-core-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qt-core-4.4.0_rc1.ebuild	23 Dec 2007 20:55:17 -0000	1.6
+++ qt-core-4.4.0_rc1.ebuild	24 Dec 2007 15:06:13 -0000	1.7
@@ -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-core/qt-core-4.4.0_rc1.ebuild,v 1.6 2007/12/23 20:55:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild,v 1.7 2007/12/24 15:06:13 caleb Exp $
 
 EAPI=1
 
@@ -78,8 +78,12 @@
 	cat > "${T}/44qt4" << EOF
 LDPATH=${libdirs:1}
 EOF
-
 	doenvd "${T}/44qt4"
+
+	# If we already have a qconfig.pri installed on the system, don't overwrite it with a new one.
+	if [ -a ${QTDATADIR}/mkspecs/qconfig.pri ]; then
+		rm "${D}"/${QTDATDIR}/mkspecs/qconfig.pri
+	fi
 }
 
 pkg_setup() {



-- 
gentoo-commits@g.o mailing list