app-text/cuneiform-qt: Drop wrong versioned live ebuild, quote EAPI var, use PN,...

svn path=/sunrise/; revision=8469

diff --git a/app-text/cuneiform-qt/ChangeLog b/app-text/cuneiform-qt/ChangeLog
index 5df3786a8927ead44602d5555340aba985f4ebc5..8678bfeed6639edefba4bcfb32dc1d8151eba9b8 100644 (file)
--- a/app-text/cuneiform-qt/ChangeLog
+++ b/app-text/cuneiform-qt/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Apr 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  cuneiform-qt-0.1.2.ebuild, -cuneiform-qt-0.1.2.9999.ebuild,
+  cuneiform-qt-9999.ebuild:
+  Drop wrong versioned live ebuild, quote EAPI var, use PN, drop S, drop
+  unneeded die for equmake4
+
   30 Apr 2009; A.C.Heron <acheron@front.ru> cuneiform-qt-0.1.2.ebuild,
   +cuneiform-qt-9999.ebuild:
   Changed git ebuild version to 9999, changed qt-gui version >=4.4 to slot 4

diff --git a/app-text/cuneiform-qt/Manifest b/app-text/cuneiform-qt/Manifest
index d7ecf8ac0104ba04b87e8ea202ef8033ead5a824..3386189404027fa9da300b032940ba953a67def4 100644 (file)
--- a/app-text/cuneiform-qt/Manifest
+++ b/app-text/cuneiform-qt/Manifest
@@ -1,5 +1,5 @@
 DIST cuneiform-qt-0.1.2.tar.bz2 23252 RMD160 40848545214665b60611b3da290b637066bc09fc SHA1 4558782bd5b40d3798e83649437d43662fd2bc61 SHA256 2b713e5ab855a50ab888b6b033073c2cbb39616b6744dae5a6b2831405d64236
-EBUILD cuneiform-qt-0.1.2.ebuild 758 RMD160 fe1b80ce2323d8edb879f9be1b2159e3b895b132 SHA1 73ba323d07355263a22a25f9ec13c5fa1b56a968 SHA256 df5ade9a891b7d0dcbc6f7f92f762be292077df7c9fcb67af9b270fd9e811d84
-EBUILD cuneiform-qt-9999.ebuild 837 RMD160 e2ac17fdcd40f3a4ade62830be6ab485d020ec17 SHA1 09011f822c3f32235fb4efaa949232b5fc10c629 SHA256 d5e6a8410ca5d7981a5b7edcb0f02a93783ca74a26d0de9be01553a91284e121
-MISC ChangeLog 453 RMD160 4aa88f4716e83bfc1e0dc00a4ad92aefc40157c9 SHA1 19284a225798a7d77c5c720a55a306956c50a0b6 SHA256 74b6db2d94050dc17d49d0f386eabb730b431c954b92ebb4040c499f41e7646f
+EBUILD cuneiform-qt-0.1.2.ebuild 734 RMD160 e5259d1681da69354aa6445e8282b12061ed4a31 SHA1 f7caea18ec430a29d715eca76d5e0f3ab09eeb3a SHA256 651834e8494aa335d5cbd531f387d9d17561651b7d228b1ddb3fe3a8635ee70d
+EBUILD cuneiform-qt-9999.ebuild 778 RMD160 91118fc9011b1ffb2503779306a9c16d54317fca SHA1 a2a9cfe1cb6817a30064583d5d0050fe173af2cb SHA256 1cd27dd53d603f656e42c02f48fe4b22ecd41ceafd06eaec9804ddd20c05d96b
+MISC ChangeLog 704 RMD160 141d67ab3c1c14d8b0792df484f3907d4fdec9d6 SHA1 0adddd386de87c9a0fb573a85ab0a2e216e541a9 SHA256 72fb562d628e525cec96a82a8eed743260dc85088df9538a22421d59fc3f7c6b
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/app-text/cuneiform-qt/cuneiform-qt-0.1.2.9999.ebuild b/app-text/cuneiform-qt/cuneiform-qt-0.1.2.9999.ebuild
deleted file mode 100644 (file)
index fe623b3..0000000
--- a/app-text/cuneiform-qt/cuneiform-qt-0.1.2.9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit qt4 git
-
-EGIT_REPO_URI="git://git.altlinux.org/people/cas/packages/cuneiform-qt.git"
-
-DESCRIPTION="Qt interface for Cuneiform"
-HOMEPAGE="http://www.altlinux.org/Cuneiform-Qt"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/qt-gui-4.4
-       app-text/cuneiform"
-RDEPEND="${DEPEND}"
-
-src_compile () {
-       cd "${S}/cuneiform-qt"
-       sed 's:/share/apps/cuneiform-qt/:/share/cuneiform-qt/:' -i cuneiform-qt.pro || die "Cannot patch cuneiform-qt.pro"
-       PREFIX="/usr" eqmake4 || die "Cannot run qmake"
-       emake || die "Cannot run make"
-}
-
-src_install() {
-       cd "${S}/cuneiform-qt"
-       dodoc AUTHORS README TODO || die "Cannot install docs"
-       INSTALL_ROOT="${D}" emake install || die "Cannot install"
-}
-

diff --git a/app-text/cuneiform-qt/cuneiform-qt-0.1.2.ebuild b/app-text/cuneiform-qt/cuneiform-qt-0.1.2.ebuild
index 77bdada5a301ed2a013db1a8ab445849d8b78e0e..2c48a59e8554995e7cee223599851af3af662efc 100644 (file)
--- a/app-text/cuneiform-qt/cuneiform-qt-0.1.2.ebuild
+++ b/app-text/cuneiform-qt/cuneiform-qt-0.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
+EAPI="1"
 
 inherit qt4
 
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}"
 
 src_compile () {
        sed 's:/share/apps/cuneiform-qt/:/share/cuneiform-qt/:' -i cuneiform-qt.pro || die "Cannot patch cuneiform-qt.pro"
-       PREFIX="/usr" eqmake4 || die "Cannot run qmake"
+       PREFIX="/usr" eqmake4
        emake || die "Cannot run make"
 }
 

diff --git a/app-text/cuneiform-qt/cuneiform-qt-9999.ebuild b/app-text/cuneiform-qt/cuneiform-qt-9999.ebuild
index 9bba17f60ae1667239d9421890008eeb121aebba..e3cdcaa6055df368fcd71be36ae62acce2dd768e 100644 (file)
--- a/app-text/cuneiform-qt/cuneiform-qt-9999.ebuild
+++ b/app-text/cuneiform-qt/cuneiform-qt-9999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=1
+EAPI="1"
 
 inherit qt4 git
 
-EGIT_REPO_URI="git://git.altlinux.org/people/cas/packages/cuneiform-qt.git"
+EGIT_REPO_URI="git://git.altlinux.org/people/cas/packages/${PN}.git"
 
 DESCRIPTION="Qt interface for Cuneiform"
 HOMEPAGE="http://www.altlinux.org/Cuneiform-Qt"
@@ -21,14 +21,14 @@ DEPEND="x11-libs/qt-gui:4
 RDEPEND="${DEPEND}"
 
 src_compile () {
-       cd "${S}/cuneiform-qt"
+       cd ${PN}
        sed 's:/share/apps/cuneiform-qt/:/share/cuneiform-qt/:' -i cuneiform-qt.pro || die "Cannot patch cuneiform-qt.pro"
-       PREFIX="/usr" eqmake4 || die "Cannot run qmake"
+       PREFIX="/usr" eqmake4
        emake || die "Cannot run make"
 }
 
 src_install() {
-       cd "${S}/cuneiform-qt"
+       cd ${PN}
        dodoc AUTHORS README TODO || die "Cannot install docs"
        INSTALL_ROOT="${D}" emake install || die "Cannot install"
 }