diff options
author | Caleb Tennis <caleb@gentoo.org> | 2007-10-23 12:44:06 +0000 |
---|---|---|
committer | Caleb Tennis <caleb@gentoo.org> | 2007-10-23 12:44:06 +0000 |
commit | 675f613d567e44cae5fff948344e9311aa51efe0 (patch) | |
tree | 79f5289ad24b5f95f52de46bc5d5f8fd41518a12 /dev-java/qtjambi | |
parent | Remove old versions (diff) | |
download | gentoo-2-675f613d567e44cae5fff948344e9311aa51efe0.tar.gz gentoo-2-675f613d567e44cae5fff948344e9311aa51efe0.tar.bz2 gentoo-2-675f613d567e44cae5fff948344e9311aa51efe0.zip |
remove old versions
(Portage version: 2.1.3.14)
Diffstat (limited to 'dev-java/qtjambi')
-rw-r--r-- | dev-java/qtjambi/ChangeLog | 7 | ||||
-rw-r--r-- | dev-java/qtjambi/files/digest-qtjambi-4.3.0_p1-r2 | 3 | ||||
-rw-r--r-- | dev-java/qtjambi/files/generator.patch | 11 | ||||
-rw-r--r-- | dev-java/qtjambi/files/jambipropertysheet.diff | 11 | ||||
-rw-r--r-- | dev-java/qtjambi/files/qdesigner_utils_p.h | 135 | ||||
-rw-r--r-- | dev-java/qtjambi/files/shared_global_p.h | 58 | ||||
-rw-r--r-- | dev-java/qtjambi/qtjambi-4.3.0_p1-r2.ebuild | 112 |
7 files changed, 6 insertions, 331 deletions
diff --git a/dev-java/qtjambi/ChangeLog b/dev-java/qtjambi/ChangeLog index b803628cb332..d453eec32740 100644 --- a/dev-java/qtjambi/ChangeLog +++ b/dev-java/qtjambi/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/qtjambi # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.8 2007/10/23 12:33:42 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/ChangeLog,v 1.9 2007/10/23 12:44:05 caleb Exp $ + + 23 Oct 2007; Caleb Tennis <caleb@gentoo.org> -files/generator.patch, + -files/jambipropertysheet.diff, -files/qdesigner_utils_p.h, + -files/shared_global_p.h, -qtjambi-4.3.0_p1-r2.ebuild: + remove old versions *qtjambi-4.3.2_p1 (23 Oct 2007) diff --git a/dev-java/qtjambi/files/digest-qtjambi-4.3.0_p1-r2 b/dev-java/qtjambi/files/digest-qtjambi-4.3.0_p1-r2 deleted file mode 100644 index 6811b8d10351..000000000000 --- a/dev-java/qtjambi/files/digest-qtjambi-4.3.0_p1-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 513d69812c65bbcc8009e4d4825548d9 qtjambi-gpl-src-4.3.0_01.tar.gz 3371479 -RMD160 bf9b0ed24abcb831228f4c8de4c7fffdb843255e qtjambi-gpl-src-4.3.0_01.tar.gz 3371479 -SHA256 dcbf214c96a39871868e43bef04b552f563359df400d4b05576b60ccb03e7dc3 qtjambi-gpl-src-4.3.0_01.tar.gz 3371479 diff --git a/dev-java/qtjambi/files/generator.patch b/dev-java/qtjambi/files/generator.patch deleted file mode 100644 index f2292fae95ee..000000000000 --- a/dev-java/qtjambi/files/generator.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- generator/main.h 2007-05-30 02:46:24.000000000 -0400 -+++ generator/main.h 2007-06-07 08:54:54.000000000 -0400 -@@ -57,8 +57,6 @@ - return false; - } - -- qtdir += "/include"; -- - QString currentDir = QDir::current().absolutePath(); - QFileInfo sourceInfo(sourceFile); - QDir::setCurrent(sourceInfo.absolutePath()); diff --git a/dev-java/qtjambi/files/jambipropertysheet.diff b/dev-java/qtjambi/files/jambipropertysheet.diff deleted file mode 100644 index 0747d2a6b1e7..000000000000 --- a/dev-java/qtjambi/files/jambipropertysheet.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- qtjambi_designer/jambipropertysheet.cpp.orig 2007-06-07 10:45:39.000000000 -0400 -+++ qtjambi_designer/jambipropertysheet.cpp 2007-06-07 10:45:49.000000000 -0400 -@@ -27,7 +27,7 @@ - #include "qtjambi_core.h" - #include "qtjambi_utils.h" - --#include <QtDesigner/private/qdesigner_utils_p.h> -+#include <qdesigner_utils_p.h> - - jclass class_NamedIntSet; - diff --git a/dev-java/qtjambi/files/qdesigner_utils_p.h b/dev-java/qtjambi/files/qdesigner_utils_p.h deleted file mode 100644 index 3ec27ee88313..000000000000 --- a/dev-java/qtjambi/files/qdesigner_utils_p.h +++ /dev/null @@ -1,135 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved. -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://www.trolltech.com/products/qt/opensource.html -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://www.trolltech.com/products/qt/licensing.html or contact the -** sales department at sales@trolltech.com. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of Qt Designer. This header -// file may change from version to version without notice, or even be removed. -// -// We mean it. -// - -#ifndef QDESIGNER_UTILS_H -#define QDESIGNER_UTILS_H - -#include "shared_global_p.h" - -#include <QtDesigner/QDesignerFormWindowInterface> - -#include <QtCore/QVariant> -#include <QtCore/QMap> -#include <QtGui/QMainWindow> - -class QIcon; -class QPixmap; - -namespace qdesigner_internal { -class ResourceMimeData; - -QDESIGNER_SHARED_EXPORT void designerWarning(const QString &message); - -class QDESIGNER_SHARED_EXPORT EnumType -{ -public: - typedef QMap<QString, QVariant> ItemMap; - - QString id() const; - - QVariant value; - ItemMap items; - QStringList names; -}; - - -class QDESIGNER_SHARED_EXPORT FlagType -{ -public: - typedef QMap<QString, QVariant> ItemMap; - - QStringList flags() const; - QString flagString() const; - - QVariant value; - ItemMap items; -}; - -// Convenience to return a dropped icon, normalized to form directory -QDESIGNER_SHARED_EXPORT QIcon resourceMimeDataToIcon(const ResourceMimeData &rmd, QDesignerFormWindowInterface *fw); -// Convenience to return an dropped pixmap, normalized to form directory -QDESIGNER_SHARED_EXPORT QPixmap resourceMimeDataToPixmap(const ResourceMimeData &rmd, QDesignerFormWindowInterface *fw); - -// Convenience to run UIC -enum UIC_Mode { UIC_GenerateCode, UIC_ConvertV3 }; -QDESIGNER_SHARED_EXPORT bool runUIC(const QString &fileName, UIC_Mode mode, QByteArray& ba, QString &errorMessage); -} // namespace qdesigner_internal - -Q_DECLARE_METATYPE(qdesigner_internal::EnumType) -Q_DECLARE_METATYPE(qdesigner_internal::FlagType) - -namespace qdesigner_internal { namespace Utils { - -inline int valueOf(const QVariant &value, bool *ok = 0) -{ - if (qVariantCanConvert<EnumType>(value)) - return qVariantValue<EnumType>(value).value.toInt(ok); - else if (qVariantCanConvert<FlagType>(value)) - return qVariantValue<FlagType>(value).value.toInt(ok); - - return value.toInt(ok); -} - -inline bool isObjectAncestorOf(QObject *ancestor, QObject *child) -{ - QObject *obj = child; - while (obj != 0) { - if (obj == ancestor) - return true; - obj = obj->parent(); - } - return false; -} - -inline bool isCentralWidget(QDesignerFormWindowInterface *fw, QWidget *widget) -{ - if (! fw || ! widget) - return false; - - if (widget == fw->mainContainer()) - return true; - - // ### generalize for other containers - if (QMainWindow *mw = qobject_cast<QMainWindow*>(fw->mainContainer())) { - return mw->centralWidget() == widget; - } - - return false; -} - -} // namespace Utils - -} // namespace qdesigner_internal - -#endif // QDESIGNER_UTILS_H diff --git a/dev-java/qtjambi/files/shared_global_p.h b/dev-java/qtjambi/files/shared_global_p.h deleted file mode 100644 index 5bbbdb8080d2..000000000000 --- a/dev-java/qtjambi/files/shared_global_p.h +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 1992-2007 Trolltech ASA. All rights reserved. -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://www.trolltech.com/products/qt/opensource.html -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://www.trolltech.com/products/qt/licensing.html or contact the -** sales department at sales@trolltech.com. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of Qt Designer. This header -// file may change from version to version without notice, or even be removed. -// -// We mean it. -// - -#ifndef SHARED_GLOBAL_H -#define SHARED_GLOBAL_H - -#include <QtCore/qglobal.h> - -#ifdef QT_DESIGNER_STATIC -#define QDESIGNER_SHARED_EXTERN -#define QDESIGNER_SHARED_IMPORT -#else -#define QDESIGNER_SHARED_EXTERN Q_DECL_EXPORT -#define QDESIGNER_SHARED_IMPORT Q_DECL_IMPORT -#endif - -#ifndef QT_NO_SHARED_EXPORT -# ifdef QDESIGNER_SHARED_LIBRARY -# define QDESIGNER_SHARED_EXPORT QDESIGNER_SHARED_EXTERN -# else -# define QDESIGNER_SHARED_EXPORT QDESIGNER_SHARED_IMPORT -# endif -#else -# define QDESIGNER_SHARED_EXPORT -#endif - -#endif // SHARED_GLOBAL_H diff --git a/dev-java/qtjambi/qtjambi-4.3.0_p1-r2.ebuild b/dev-java/qtjambi/qtjambi-4.3.0_p1-r2.ebuild deleted file mode 100644 index 08573ccd6034..000000000000 --- a/dev-java/qtjambi/qtjambi-4.3.0_p1-r2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/qtjambi/qtjambi-4.3.0_p1-r2.ebuild,v 1.2 2007/06/26 01:48:34 mr_bones_ Exp $ - -inherit eutils java-pkg-2 - -QTVERSION=4.3.0 -PATCHRELEASE=01 - -DESCRIPTION="QtJambi is a set of Java bindings and utilities for the Qt C++ toolkit." -HOMEPAGE="http://www.trolltech.com/" - -MY_PV=${QTVERSION}_${PATCHRELEASE} - -SRC_URI="ftp://ftp.trolltech.com/pub/qtjambi/source/qtjambi-gpl-src-${MY_PV}.tar.gz" -S=${WORKDIR}/qtjambi-gpl-src-${MY_PV} - -LICENSE="GPL-2" -SLOT="4" -KEYWORDS="~x86" - -IUSE="" - -DEPEND="~x11-libs/qt-4.3.0 - >=virtual/jdk-1.5" - -RDEPEND="~x11-libs/qt-4.3.0 - >=virtual/jre-1.5" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/generator.patch - epatch ${FILESDIR}/qtjambi_base.pri.diff - epatch ${FILESDIR}/jambipropertysheet.diff - epatch ${FILESDIR}/jambi.pri.diff - - # If Qt wasn't built with accessibility use flag, then we needto remove some files from - # the list. - if ! built_with_use =x11-libs/qt-4* accessibility; then - epatch ${FILESDIR}/java_files_remove_accessibility.diff - fi - if ! built_with_use =x11-libs/qt-4* ssl; then - epatch ${FILESDIR}/java_files_remove_ssl.diff - fi - - # These are two private headers from QtDesigner that aren't installed in the normal - # Qt distribution, but are needed when building QtJambi - cp ${FILESDIR}/qdesigner_utils_p.h ${S}/qtjambi_designer - cp ${FILESDIR}/shared_global_p.h ${S}/qtjambi_designer -} - -src_compile() { - - # Step 1, build the source generator - einfo "Building the source generator" - cd ${S}/generator - /usr/bin/qmake && make || die "Error building generator" - - # Step 2, run the generator - einfo "Running the generator. This may take a few minutes." - QTDIR=/usr/include/qt4 ./generator - - # Step 3, build the generated sources - export JAVADIR=$JDK_HOME - einfo "Building the generated sources." - cd ${S} && /usr/bin/qmake && make || die "Error building generated sources" - - # Step 4, generate Ui_.java files - einfo "Running juic" - cd ${S} && ./bin/juic -cp . - - # Step 5, compiling java files - einfo "Compiling java files" - mkdir -p ${S}/class - cd ${S} && ejavac -d class @java_files - - # Step 6, build the jar file - cd ${S}/class && jar cf ../qtjambi.jar com/trolltech/qt com/trolltech/tools - # copy built classes for demos and examples - cd ${S}/class && cp -r com/trolltech/demos com/trolltech/examples com/trolltech/launcher ../com/trolltech - cd ${S} && jar cf qtjambi-src.jar com - - # generate start scripts - jcp="/usr/share/qtjambi-4/lib" - cd ${S} && echo "#!/bin/sh" > bin/jambi-designer - cd ${S} && echo "LD_LIBRARY_PATH=/usr/lib/qt4 CLASSPATH=${jcp}/qtjambi.jar:${jcp}/qtjambi-src.jar:$CLASSPATH /usr/bin/designer" >> bin/jambi-designer - - cd ${S} && echo "#!/bin/sh" > bin/jambi - cd ${S} && echo "LD_LIBRARY_PATH=/usr/lib/qt4 java -cp ${jcp}/qtjambi.jar:${jcp}/qtjambi-src.jar com.trolltech.launcher.Launcher" >> bin/jambi -} - -src_install() { - # Install built jar - java-pkg_dojar qtjambi.jar - java-pkg_dojar qtjambi-src.jar - - # Install designer plugins - insinto /usr/$(get_libdir)/qt4/plugins/designer - insopts -m0755 - doins plugins/designer/*.so - - cp -dpPR ${S}/lib/* ${D}/usr/$(get_libdir)/qt4 - - # Install binaries - dobin bin/* - - einfo "eclipse - Project->Properties->Java Build Path->Libraries:" - einfo "library: /usr/share/qtjambi-4/lib/qtjambi.jar" - einfo "source (& demos): /usr/share/qtjambi-4/lib/qtjambi-src.jar" - einfo "native library location: /usr/$(get_libdir)/qt4/" -} |