[gentoo-commits] repo/gentoo:master commit in: dev-util/universalindentgui/
commit: c67868a13facfa5fd05cd8e9d501bac0349f554b Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 12 12:24:21 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 12 12:28:14 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c67868a1 dev-util/universalindentgui: remove last rited package dev-util/universalindentgui/Manifest | 1 - dev-util/universalindentgui/metadata.xml | 14 --- .../universalindentgui-1.2.0-r3.ebuild | 137 - 3 files changed, 152 deletions(-) diff --git a/dev-util/universalindentgui/Manifest b/dev-util/universalindentgui/Manifest deleted file mode 100644 index b33f19da87a..000 --- a/dev-util/universalindentgui/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST universalindentgui-1.2.0.tar.gz 863793 SHA256 78a8d5538b951080c521118a0cefcae5bf1b32a3f0a022087087af3d70e98338 SHA512 73535e2a199f3b0396d2d33cdf6cdf051cc4f01da4907c03ba9fd9fa86033921ff7fc448078ca2d34ae88a421f6ac51ef4c0f98daaceff40d128f55d790e197e WHIRLPOOL b445a1259bb86dbfa282f1b89b60a964deda66eb921288c1298476a47018908a2f49344ced73de1563d3b5132b50df9485a778d8073e304d4f014952d23238b2 diff --git a/dev-util/universalindentgui/metadata.xml b/dev-util/universalindentgui/metadata.xml deleted file mode 100644 index 14edd78e452..000 --- a/dev-util/universalindentgui/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - -http://www.gentoo.org/dtd/metadata.dtd";> - - - q...@gentoo.org - Gentoo Qt Project - - - Add support for HTML files - - - universalindent - - diff --git a/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild b/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild deleted file mode 100644 index c069af0d8a7..000 --- a/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-single-r1 qmake-utils - -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 examples html perl php python ruby xml" - -DEPEND="dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtscript:4 - x11-libs/qscintilla[qt4(-)] -" -RDEPEND="${DEPEND} - dev-util/astyle - dev-util/bcpp - dev-util/indent - html? ( - app-text/htmltidy - perl? ( dev-lang/perl ) - ) - perl? ( dev-perl/Perl-Tidy ) - php? ( dev-php/PEAR-PHP_Beautifier ) - python? ( ${PYTHON_DEPS} ) - ruby? ( dev-lang/ruby ) - xml? ( dev-util/xmlindent ) -" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - # correct translation binaries - sed -e "s|lupdate-qt4|$(qt4_get_bindir)/lupdate|" \ - -e "s|lrelease-qt4|$(qt4_get_bindir)/lrelease|" \ - -i UniversalIndentGUI.pro || die "sed pro translation binary" - - if use debug; then - sed -i -e 's:release,:debug,:g' UniversalIndentGUI.pro || die - fi - - # patch .pro file according to our use flags - # basic support - UEXAMPLES="cpp sh" - local UINDENTERS="shellindent.awk" - local UIGUIFILES="shellindent gnuindent bcpp astyle" - - if use html; then - UEXAMPLES="${UEXAMPLES} html" - UIGUIFILES="${UIGUIFILES} tidy" - if use perl; then - UINDENTERS="${UINDENTERS} hindent" - UIGUIFILES="${UIGUIFILES} hindent" - fi - fi - - if use perl; then - UEXAMPLES="${UEXAMPLES} pl" - UIGUIFILES="${UIGUIFILES} perltidy" - fi - - if use php; then - UEXAMPLES="${UEXAMPLES} php" - UINDENTERS="${UINDENTERS} phpStylist.php" - UIGUIFILES="${UIGUIFILES} php_Beautifier phpStylist" - fi - - if use python; then - UEXAMPLES="${UEXAMPLES} py" - UINDENTERS="${UINDENTERS} pindent.py" - UIGUIFILES="${UIGUIFILES} pindent" - python_fix_shebang . - fi - - if use ruby; then - UEXAMPLES="${UEXAMPLES} rb" - UINDENTERS="${UINDENTERS} rbeautify.rb ruby_formatter.rb" - UIGUIFILES="${UIGUIFILES} rbeautify rubyformatter" - fi - - if use xml; then - UEXAMPLES="${UEXAMPLES} xml" - UIGUIFILES="${UIGUIFILES} xmlindent" - fi - - local IFILES= I= - for I in ${UIND
[gentoo-commits] repo/gentoo:master commit in: dev-util/universalindentgui/
commit: fa81635ef1f1423c47dbb7a9e7ffcc4208952203 Author: Michał Górny gentoo org> AuthorDate: Sat Feb 18 11:30:14 2017 + Commit: Michał Górny gentoo org> CommitDate: Sat Feb 18 11:31:03 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa81635e dev-util/universalindentgui: fix icon suffix, #609698 dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild b/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild index c0e56b5229..165e24a691 100644 --- a/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild +++ b/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild @@ -133,6 +133,6 @@ src_install() { done fi - newicon resources/universalIndentGUI_512x512.png ${PN} + newicon resources/universalIndentGUI_512x512.png ${PN}.png make_desktop_entry ${PN} UniversalIndentGUI ${PN} "Qt;Development" }
[gentoo-commits] repo/gentoo:master commit in: dev-util/universalindentgui/
commit: 22042e328bd7c077739163c4822a74855795bd3e Author: Michał Górny gentoo org> AuthorDate: Sat Feb 18 11:28:45 2017 + Commit: Michał Górny gentoo org> CommitDate: Sat Feb 18 11:31:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22042e32 dev-util/universalindentgui: python-single-r1, \!qt4-r2, EAPI=6 ...2.ebuild => universalindentgui-1.2.0-r3.ebuild} | 42 ++ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/dev-util/universalindentgui/universalindentgui-1.2.0-r2.ebuild b/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild similarity index 81% rename from dev-util/universalindentgui/universalindentgui-1.2.0-r2.ebuild rename to dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild index 457c80eb24..c0e56b5229 100644 --- a/dev-util/universalindentgui/universalindentgui-1.2.0-r2.ebuild +++ b/dev-util/universalindentgui/universalindentgui-1.2.0-r3.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 -PYTHON_DEPEND="python? 2" -LANGS="de fr ja ru uk zh_TW" +EAPI=6 +PYTHON_COMPAT=( python2_7 ) -inherit eutils python qmake-utils qt4-r2 +inherit eutils python-single-r1 qmake-utils DESCRIPTION="Cross platform GUI for several code formatters, beautifiers and indenters" HOMEPAGE="http://universalindent.sourceforge.net/"; @@ -32,20 +31,20 @@ RDEPEND="${DEPEND} ) perl? ( dev-perl/Perl-Tidy ) php? ( dev-php/PEAR-PHP_Beautifier ) + python? ( ${PYTHON_DEPS} ) ruby? ( dev-lang/ruby ) xml? ( dev-util/xmlindent ) " -DOCS="CHANGELOG.txt readme.html" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi + use python && python-single-r1_pkg_setup } src_prepare() { + default + # correct translation binaries sed -e "s|lupdate-qt4|$(qt4_get_bindir)/lupdate|" \ -e "s|lrelease-qt4|$(qt4_get_bindir)/lrelease|" \ @@ -85,7 +84,7 @@ src_prepare() { UEXAMPLES="${UEXAMPLES} py" UINDENTERS="${UINDENTERS} pindent.py" UIGUIFILES="${UIGUIFILES} pindent" - python_convert_shebangs -r 2 . + python_fix_shebang . fi if use ruby; then @@ -102,7 +101,7 @@ src_prepare() { local IFILES= I= for I in ${UINDENTERS}; do IFILES="${IFILES} indenters/${I}" - chmod +x indenters/${I} + chmod +x indenters/${I} || die done for I in ${UIGUIFILES}; do @@ -114,28 +113,23 @@ src_prepare() { die ".pro patching failed" sed -i -e "s:indenters/uigui_\*\.ini:${IFILES}:" UniversalIndentGUI.pro || die ".pro patching failed" +} - local lang - for lang in ${LANGS}; do - if ! use linguas_${lang}; then - sed -e "/_${lang}.ts/d" -e "/_${lang}.qm/d" \ - -i UniversalIndentGUI.pro || die "failed while disabling ${lang}" - fi - done - - qt4-r2_src_prepare +src_configure() { + eqmake4 UniversalIndentGUI.pro } src_install() { - qt4-r2_src_install + emake install INSTALL_ROOT="${D}" + dodoc CHANGELOG.txt readme.html doman doc/${PN}.1.gz if use examples; then - insinto /usr/share/doc/${PF}/examples + docinto examples local I for I in ${UEXAMPLES}; do - doins indenters/example.${I} + dodoc indenters/example.${I} done fi
[gentoo-commits] repo/gentoo:master commit in: dev-util/universalindentgui/
commit: f2f105e62221baa8ae66560639334c29bfe81f99 Author: David Seifert gentoo org> AuthorDate: Thu Dec 22 17:46:38 2016 + Commit: David Seifert gentoo org> CommitDate: Thu Dec 22 18:26:16 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2f105e6 dev-util/universalindentgui: Depend on x11-libs/qscintilla[qt4] Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3188 ...rsalindentgui-1.2.0-r1.ebuild => universalindentgui-1.2.0-r2.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild b/dev-util/universalindentgui/universalindentgui-1.2.0-r2.ebuild similarity index 99% rename from dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild rename to dev-util/universalindentgui/universalindentgui-1.2.0-r2.ebuild index 1b022dd..457c80e 100644 --- a/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild +++ b/dev-util/universalindentgui/universalindentgui-1.2.0-r2.ebuild @@ -20,7 +20,7 @@ IUSE="debug examples html perl php python ruby xml" DEPEND="dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtscript:4 - x11-libs/qscintilla + x11-libs/qscintilla[qt4(-)] " RDEPEND="${DEPEND} dev-util/astyle
[gentoo-commits] repo/gentoo:master commit in: dev-util/universalindentgui/
commit: 0d1463077d1edaa1d60e721fba48f02cbccc7f92 Author: Pacho Ramos gentoo org> AuthorDate: Sun Aug 7 06:37:59 2016 + Commit: Pacho Ramos gentoo org> CommitDate: Sun Aug 7 06:37:59 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d146307 dev-util/universalindentgui: Cleanup per bug #269977 Package-Manager: portage-2.3.0 dev-util/universalindentgui/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/dev-util/universalindentgui/metadata.xml b/dev-util/universalindentgui/metadata.xml index 3ff436b..14edd78 100644 --- a/dev-util/universalindentgui/metadata.xml +++ b/dev-util/universalindentgui/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd";> - - wi...@gentoo.org - Alex Alexander - q...@gentoo.org Gentoo Qt Project
[gentoo-commits] repo/gentoo:master commit in: dev-util/universalindentgui/
commit: 445e0190a022f0a56f779b559660700331bc70cb Author: Kent Fredric gmail com> AuthorDate: Sat Mar 19 06:27:02 2016 + Commit: Andreas Hüttel gentoo org> CommitDate: Sat Mar 19 22:41:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445e0190 dev-util/universalindentgui: Fix dependency on dev-perl/Perl-Tidy Package-Manager: portage-2.2.28 dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild b/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild index b622706..1b022dd 100644 --- a/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild +++ b/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -30,7 +30,7 @@ RDEPEND="${DEPEND} app-text/htmltidy perl? ( dev-lang/perl ) ) - perl? ( dev-perl/perltidy ) + perl? ( dev-perl/Perl-Tidy ) php? ( dev-php/PEAR-PHP_Beautifier ) ruby? ( dev-lang/ruby ) xml? ( dev-util/xmlindent )
[gentoo-commits] repo/gentoo:master commit in: dev-util/universalindentgui/
commit: 603c3ff159667f4743db75163fc210c54c495303 Author: Michael Palimaka gentoo org> AuthorDate: Sun Dec 20 15:01:19 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Dec 20 15:01:57 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=603c3ff1 dev-util/universalindentgui: use correct version of lrelease/update Package-Manager: portage-2.2.26 dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild b/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild index 8b9cd96..b622706 100644 --- a/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild +++ b/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild @@ -6,7 +6,7 @@ EAPI=4 PYTHON_DEPEND="python? 2" LANGS="de fr ja ru uk zh_TW" -inherit eutils python qt4-r2 +inherit eutils python qmake-utils qt4-r2 DESCRIPTION="Cross platform GUI for several code formatters, beautifiers and indenters" HOMEPAGE="http://universalindent.sourceforge.net/"; @@ -47,8 +47,8 @@ pkg_setup() { src_prepare() { # correct translation binaries - sed -e "s/lupdate-qt4/lupdate/" \ - -e "s/lrelease-qt4/lrelease/" \ + sed -e "s|lupdate-qt4|$(qt4_get_bindir)/lupdate|" \ + -e "s|lrelease-qt4|$(qt4_get_bindir)/lrelease|" \ -i UniversalIndentGUI.pro || die "sed pro translation binary" if use debug; then