Rolling back last commit to submit it again properly

svn path=/sunrise/; revision=2127

diff --git a/media-video/subtitleeditor/ChangeLog b/media-video/subtitleeditor/ChangeLog
index 2b86660fbd1e99f64d1e1610d7d69a9d55e82305..7e282df20aad73882670e027f8493da36c605717 100644 (file)
--- a/media-video/subtitleeditor/ChangeLog
+++ b/media-video/subtitleeditor/ChangeLog
@@ -2,10 +2,6 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  05 Dec 2006; Alex Tarkovsky <alextarkovsky@gmail.org>
-  -subtitleeditor-0.12.2.ebuild, +subtitleeditor-0.12.2-r1.ebuild:
-  Removing sandbox-violating 0.12.2 revision, adding -r1 with fix.
-
   29 Nov 2006; Juan Aguado (juantxorena) <juantxorena666@gmail.com>
   +subtitleeditor-0.12.2.ebuild:
   Version bump

diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
index aeedbbafd9adf5adcf2882931b32f392142aa3ec..04b889111b567420d9d0af8f080a0c499c83d45b 100644 (file)
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1,16 +1,16 @@
 DIST subtitleeditor-0.12.2.tar.gz 565563 RMD160 02517035b524969fff26234e34941966c084992e SHA1 e765be6cdcc0af415be6e74e8d9d200f91fa919b SHA256 52464f997a98cc8f048cac6a7823b8632390572b664c94658364897e7ca33818
-EBUILD subtitleeditor-0.12.2-r1.ebuild 1337 RMD160 2be2c4e3201197a6950c40f90bdb0ac0d03e8f6e SHA1 74de15e45809503876e38b9c3bb472da7d7625bb SHA256 39977e60408f5094f2ed5eb031771cde1e0b21f6428631304f637856d8a823da
-MD5 9df20e8ee7d5cdc5ef3002c5a54e4092 subtitleeditor-0.12.2-r1.ebuild 1337
-RMD160 2be2c4e3201197a6950c40f90bdb0ac0d03e8f6e subtitleeditor-0.12.2-r1.ebuild 1337
-SHA256 39977e60408f5094f2ed5eb031771cde1e0b21f6428631304f637856d8a823da subtitleeditor-0.12.2-r1.ebuild 1337
-MISC ChangeLog 866 RMD160 9ffba36a683dd1a5a5dedc351dcfa3b33f24b3db SHA1 513a9222e5e9da8c8afdcc2a32e85c997310a001 SHA256 c8a20c6c7caaddc63e67f1fee04320a4e9622b53747ec7d4541854f2258a229f
-MD5 97510fddf714843ad56b29ff987511b9 ChangeLog 866
-RMD160 9ffba36a683dd1a5a5dedc351dcfa3b33f24b3db ChangeLog 866
-SHA256 c8a20c6c7caaddc63e67f1fee04320a4e9622b53747ec7d4541854f2258a229f ChangeLog 866
+EBUILD subtitleeditor-0.12.2.ebuild 1299 RMD160 5fd2094c44f86abcbe285d14f73c11401ce3387a SHA1 2d22411cdc8d2a8506402ae9b864d0d5c7736276 SHA256 d1a667dccb81a309898b2c5a6faaab4e59bc30110e22e6703cf3dc4e94f5a4e8
+MD5 6ebd2a9e6b1d3f44df5051dcb59e6508 subtitleeditor-0.12.2.ebuild 1299
+RMD160 5fd2094c44f86abcbe285d14f73c11401ce3387a subtitleeditor-0.12.2.ebuild 1299
+SHA256 d1a667dccb81a309898b2c5a6faaab4e59bc30110e22e6703cf3dc4e94f5a4e8 subtitleeditor-0.12.2.ebuild 1299
+MISC ChangeLog 675 RMD160 768dd22dac59b7488336863b45046b47db66a2a0 SHA1 06e6d36c13cf0ac057e871e36ec02f2ccac27f63 SHA256 b987a659eda13e4848239d71fc0beb2f64c237d48b95fcd97b2efa2ed8824486
+MD5 b972ab911f87522d1b9ab44c69c24734 ChangeLog 675
+RMD160 768dd22dac59b7488336863b45046b47db66a2a0 ChangeLog 675
+SHA256 b987a659eda13e4848239d71fc0beb2f64c237d48b95fcd97b2efa2ed8824486 ChangeLog 675
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 aa3bb06db06c59e49f61da109d47a662 files/digest-subtitleeditor-0.12.2-r1 265
-RMD160 c8cd83b4d7c6ae28b1be30191c69fca2f20efd07 files/digest-subtitleeditor-0.12.2-r1 265
-SHA256 4e5408445735a9dbc63d5030eefac75c1d43bcf4e6bce76dfb798dab17e326f0 files/digest-subtitleeditor-0.12.2-r1 265
+MD5 aa3bb06db06c59e49f61da109d47a662 files/digest-subtitleeditor-0.12.2 265
+RMD160 c8cd83b4d7c6ae28b1be30191c69fca2f20efd07 files/digest-subtitleeditor-0.12.2 265
+SHA256 4e5408445735a9dbc63d5030eefac75c1d43bcf4e6bce76dfb798dab17e326f0 files/digest-subtitleeditor-0.12.2 265

diff --git a/media-video/subtitleeditor/files/digest-subtitleeditor-0.12.2-r1 b/media-video/subtitleeditor/files/digest-subtitleeditor-0.12.2
similarity index 100%
rename from media-video/subtitleeditor/files/digest-subtitleeditor-0.12.2-r1
rename to media-video/subtitleeditor/files/digest-subtitleeditor-0.12.2

diff --git a/media-video/subtitleeditor/subtitleeditor-0.12.2-r1.ebuild b/media-video/subtitleeditor/subtitleeditor-0.12.2-r1.ebuild
deleted file mode 100644 (file)
index b237fd9..0000000
--- a/media-video/subtitleeditor/subtitleeditor-0.12.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MY_PV="${PV//_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A GTK+ subtitle editing tool"
-HOMEPAGE="http://kitone.free.fr/subtitleeditor/"
-SRC_URI="http://kitone.free.fr/${PN}/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="cairo debug spell"
-
-# pcre needs to support utf8; current version in portage forces it, fortunately
-DEPEND=">=dev-cpp/gtkmm-2.6
-       >=dev-cpp/libglademm-2.4
-       dev-libs/libpcre
-       >=media-libs/gstreamer-0.10
-       >=x11-libs/gtk+-2.6
-       cairo? ( x11-libs/cairo )
-       spell? ( >=app-text/enchant-1.1.0 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-       export GST_REGISTRY="${T}/home/registry.cache.xml"
-       addpredict "${ROOT}/root/.gconf"
-       addpredict "${ROOT}/root/.gconfd"
-       econf \
-               $(use_enable cairo) \
-               $(use_enable debug) \
-               $(use_enable spell enchant-support) \
-               || die "configure failed"
-       emake || die "make failed"
-}
-
-src_install() {
-       # Bug filed upstream -- (which bug is it and what does it fix?)
-       sed -i -e "s:${PN}-icon:/usr/share/${PN}/${PN}:" "share/${PN}.desktop"
-       emake DESTDIR="${D}" install || die "make install failed"
-       dodoc AUTHORS NEWS README TODO
-}
-
-pkg_postinst() {
-       use cairo && ewarn "Cairo support is not finished -- use at your own risk!"
-}

diff --git a/media-video/subtitleeditor/subtitleeditor-0.12.2.ebuild b/media-video/subtitleeditor/subtitleeditor-0.12.2.ebuild
new file mode 100644 (file)
index 0000000..00375a1
--- /dev/null
+++ b/media-video/subtitleeditor/subtitleeditor-0.12.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+DESCRIPTION="A GTK+2 tool to make and edit subtitles for GNU/*"
+HOMEPAGE="http://kitone.free.fr/subtitleeditor/"
+
+#MY_PV=`echo ${PV} | sed 's/_/-/g'` #QA: sed in global scope
+MY_PV="${PV//_/-}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="http://kitone.free.fr/${PN}/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="cairo debug spell"
+
+#pcre needs to support utf8; current version in portage forces it, fortunately
+DEPEND=">=x11-libs/gtk+-2.6
+>=dev-cpp/gtkmm-2.6
+>=dev-cpp/libglademm-2.4
+>=media-libs/gstreamer-0.10
+dev-libs/libpcre
+spell? ( >=app-text/enchant-1.1.0 )
+cairo? ( x11-libs/cairo )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+       econf \
+               $(use_enable cairo) \
+               $(use_enable debug) \
+               $(use_enable spell enchant-support) \
+               || die "econf failed"
+       emake || die "emake failed"
+}
+
+src_install() {
+       #Bug filed upstream -- (which bug is it and what does it fix?)
+       sed -i -e "s:${PN}-icon:/usr/share/${PN}/${PN}:" "share/${PN}.desktop"
+       emake DESTDIR="${D}" install || die "emake install failed"
+       dodoc AUTHORS NEWS README TODO
+}
+
+pkg_postinst() {
+       if use cairo; then
+               ewarn "cairo support is not finished, use at your own risk!"
+       fi
+}