Version bump by Michael (kensington) in bug 410789. Remove old.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

5 files changed, 63 insertions, 105 deletions

diff --git a/dev-util/universalindentgui/ChangeLog b/dev-util/universalindentgui/ChangeLog
index a7936f7fc0d7..77020ba73d06 100644
--- a/dev-util/universalindentgui/ChangeLog
+++ b/dev-util/universalindentgui/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/universalindentgui
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/universalindentgui/ChangeLog,v 1.11 2010/07/19 19:45:48 wired Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/universalindentgui/ChangeLog,v 1.12 2012/04/10 20:32:55 pesa Exp $
+
+*universalindentgui-1.2.0 (10 Apr 2012)
+
+  10 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  +universalindentgui-1.2.0.ebuild,
+  -files/universalindentgui-1.1.0-astyle_pwd_fix.patch,
+  -files/universalindentgui-1.1.0-gcc45.patch,
+  -universalindentgui-1.1.0-r3.ebuild, metadata.xml:
+  Version bump by Michael (kensington) in bug 410789. Remove old.
 
   19 Jul 2010; Alex Alexander <wired@gentoo.org>
   -universalindentgui-1.1.0-r2.ebuild:
diff --git a/dev-util/universalindentgui/files/universalindentgui-1.1.0-astyle_pwd_fix.patch b/dev-util/universalindentgui/files/universalindentgui-1.1.0-astyle_pwd_fix.patch
deleted file mode 100644
index 6dfa25196f74..000000000000
--- a/dev-util/universalindentgui/files/universalindentgui-1.1.0-astyle_pwd_fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur universalindentgui-1.1.0.orig/src/IndentHandler.cpp universalindentgui-1.1.0/src/IndentHandler.cpp
---- universalindentgui-1.1.0.orig/src/IndentHandler.cpp	2009-07-16 13:52:38.000000000 +0200
-+++ universalindentgui-1.1.0/src/IndentHandler.cpp	2010-06-26 20:30:41.000000000 +0200
-@@ -514,6 +514,10 @@
-     //indentProcess.setReadChannelMode(QProcess::MergedChannels);
- 
-     // Set the directory for the indenter execution
-+    QStringList env = indentProcess.environment();
-+    env << "PWD=" + QFileInfo(tempDirctoryStr).absoluteFilePath();
-+    indentProcess.setEnvironment( env );
-+    
-     indentProcess.setWorkingDirectory( QFileInfo(tempDirctoryStr).absoluteFilePath() );
- 
-     qDebug() << __LINE__ << " " << __FUNCTION__ << ": Will call the indenter in the directory " << indentProcess.workingDirectory() << " using this commandline call: " << indenterCompleteCallString;
-@@ -558,6 +562,7 @@
-         QApplication::restoreOverrideCursor();
-         errorMessageDialog->showMessage(tr("Error calling Indenter"), processReturnString);
-     }
-+    
- 
-     // If the indenter returned an error code != 0 show its output.
-     if ( indentProcess.exitCode() != 0 ) {
diff --git a/dev-util/universalindentgui/files/universalindentgui-1.1.0-gcc45.patch b/dev-util/universalindentgui/files/universalindentgui-1.1.0-gcc45.patch
deleted file mode 100644
index 564cca5be7e8..000000000000
--- a/dev-util/universalindentgui/files/universalindentgui-1.1.0-gcc45.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixing build with gcc 4.5
-
-https://bugs.gentoo.org/321323
-
---- src/UiGuiIniFileParser.cpp
-+++ src/UiGuiIniFileParser.cpp
-@@ -51,7 +51,7 @@
-     \brief Directly loads and parses the file with name \a iniFileName.
-  */
- UiGuiIniFileParser::UiGuiIniFileParser(const QString &iniFileName) {
--    UiGuiIniFileParser::UiGuiIniFileParser();
-+    UiGuiIniFileParser();
-     this->iniFileName = iniFileName;
-     parseIniFile();
- }
diff --git a/dev-util/universalindentgui/metadata.xml b/dev-util/universalindentgui/metadata.xml
index d4f6fbf46a34..90b035f854ab 100644
--- a/dev-util/universalindentgui/metadata.xml
+++ b/dev-util/universalindentgui/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
-<maintainer>
-<email>wired@gentoo.org</email>
-<name>Alex Alexander</name>
-</maintainer>
-<use>
-	<flag name='html'>Add support for HTML files</flag>
-</use>
-<longdescription lang="en">
-</longdescription>
+	<herd>qt</herd>
+	<maintainer>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</name>
+	</maintainer>
+	<use>
+		<flag name="html">Add support for HTML files</flag>
+	</use>
 </pkgmetadata>
-
diff --git a/dev-util/universalindentgui/universalindentgui-1.1.0-r3.ebuild b/dev-util/universalindentgui/universalindentgui-1.2.0.ebuild
index 852a15807afc..7e77ca176557 100644
--- a/dev-util/universalindentgui/universalindentgui-1.1.0-r3.ebuild
+++ b/dev-util/universalindentgui/universalindentgui-1.2.0.ebuild
@@ -1,66 +1,62 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/universalindentgui/universalindentgui-1.1.0-r3.ebuild,v 1.1 2010/07/19 19:43:38 wired Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/dev-util/universalindentgui/universalindentgui-1.2.0.ebuild,v 1.1 2012/04/10 20:32:55 pesa Exp $
 
+EAPI=4
 PYTHON_DEPEND="python? 2"
+LANGS="de fr ja ru uk zh_TW"
 
-inherit eutils qt4-r2 python
+inherit eutils python qt4-r2
 
-DESCRIPTION="Cross platform compatible GUI for several code formatters, beautifiers and indenters."
+DESCRIPTION="Cross platform GUI for several code formatters, beautifiers and indenters"
 HOMEPAGE="http://universalindent.sourceforge.net/"
 SRC_URI="mirror://sourceforge/universalindent/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug html perl php python ruby xml"
-
-LANGS="de fr ja ru uk zh_TW"
-
-for L in $LANGS; do
-	IUSE="$IUSE linguas_$L"
-done
+IUSE="debug examples html perl php python ruby xml"
 
 DEPEND="x11-libs/qt-core:4
 	x11-libs/qt-gui:4
 	x11-libs/qt-script:4
-	x11-libs/qscintilla"
+	x11-libs/qscintilla
+"
 RDEPEND="${DEPEND}
-	dev-util/indent
 	dev-util/astyle
 	dev-util/bcpp
-	html? ( app-text/htmltidy
-			perl? ( dev-lang/perl ) )
+	dev-util/indent
+	html? (
+		app-text/htmltidy
+		perl? ( dev-lang/perl )
+	)
 	perl? ( dev-perl/perltidy )
 	php? ( dev-php/PEAR-PHP_Beautifier )
 	ruby? ( dev-lang/ruby )
 	xml? ( dev-util/xmlindent )
 "
 
+DOCS="CHANGELOG.txt readme.html"
+
 pkg_setup() {
 	use python && python_set_active_version 2
 }
 
 src_prepare() {
-	# .pro fixes
-	sed -i "s:lupdate-qt4:lupdate:" UniversalIndentGUI.pro ||
-		die ".pro fix failed"
-	sed -i "s:lrelease-qt4:lrelease:" UniversalIndentGUI.pro ||
-		die ".pro fix failed"
-	sed -i "s:ja_jp.qm:ja_JP.qm:" UniversalIndentGUI.pro ||
-		die ".pro lang fix failed"
+	# correct translation binaries
+	sed -e "s/lupdate-qt4/lupdate/" \
+		-e "s/lrelease-qt4/lrelease/" \
+		-i UniversalIndentGUI.pro || die "sed pro translation binary"
+
 	if use debug; then
-		sed -i "s:release,:debug,:g" UniversalIndentGUI.pro ||
-			die ".pro debug fix failed"
+		sed -i -e 's:release,:debug,:g' UniversalIndentGUI.pro || die
 	fi
 
 	# patch .pro file according to our use flags
 	# basic support
 	UEXAMPLES="cpp sh"
-	UINDENTERS="shellindent.awk"
-	UIGUIFILES="shellindent gnuindent bcpp astyle"
+	local UINDENTERS="shellindent.awk"
+	local UIGUIFILES="shellindent gnuindent bcpp astyle"
 
 	if use html; then
 		UEXAMPLES="${UEXAMPLES} html"
@@ -100,53 +96,46 @@ src_prepare() {
 		UIGUIFILES="${UIGUIFILES} xmlindent"
 	fi
 
-	IFILES=""
+	local IFILES= I=
 	for I in ${UINDENTERS}; do
 		IFILES="${IFILES} indenters/${I}"
 		chmod +x indenters/${I}
 	done
+
 	for I in ${UIGUIFILES}; do
 		IFILES="${IFILES} indenters/uigui_${I}.ini"
 	done
 
 	# apply fixes in .pro file
-	sed -i "/^unix:indenters.files +=/d" UniversalIndentGUI.pro ||
+	sed -i -e "/^unix:indenters.files +=/d" UniversalIndentGUI.pro ||
 		die ".pro patching failed"
-	sed -i "s:indenters/uigui_\*\.ini:${IFILES}:" UniversalIndentGUI.pro ||
+	sed -i -e "s:indenters/uigui_\*\.ini:${IFILES}:" UniversalIndentGUI.pro ||
 		die ".pro patching failed"
 
+	local lang
 	for lang in ${LANGS}; do
-		if [[ ! "${LINGUAS}" =~ "${lang}" ]]; then
-			[[ ${lang} == "ja" ]] && lang="ja_JP"
-			sed -i "/_${lang}.ts/d" UniversalIndentGUI.pro || die "failed while disabling $lang"
-			sed -i "/_${lang}.qm/d" UniversalIndentGUI.pro || die "failed while disabling $lang"
+		if ! use linguas_${lang}; then
+			sed -e "/_${lang}.ts/d" -e "/_${lang}.qm/d" \
+				-i UniversalIndentGUI.pro || die "failed while disabling ${lang}"
 		fi
 	done
 
-	epatch "${FILESDIR}"/"${P}"-gcc45.patch
-	# bug #325811
-	epatch "${FILESDIR}"/"${P}"-astyle_pwd_fix.patch
+	qt4-r2_src_prepare
 }
 
-src_configure() {
-	eqmake4 UniversalIndentGUI.pro || die "eqmake4 failed"
-}
+src_install() {
+	qt4-r2_src_install
 
-src_compile() {
-	emake || die "emake failed"
-}
+	doman doc/${PN}.1.gz
 
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	dodoc *.txt || die "doc installation failed"
-	doman doc/"${PN}".1.gz || die "man page installation failed"
-	insinto /usr/share/doc/${PF}/examples
-	for I in ${UEXAMPLES}; do
-		doins indenters/example.${I}
-	done
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		local I
+		for I in ${UEXAMPLES}; do
+			doins indenters/example.${I}
+		done
+	fi
 
 	doicon resources/universalIndentGUI.png
-
-	make_desktop_entry universalindentgui UniversalIndentGUI universalIndentGUI \
-		"Qt;Development" || die "menu installation failed"
+	make_desktop_entry ${PN} UniversalIndentGUI universalIndentGUI "Qt;Development"
 }