Version bump. Make sure *.la files are deleted. Clean up old revisions.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 38 insertions, 78 deletions

diff --git a/media-video/subtitleeditor/ChangeLog b/media-video/subtitleeditor/ChangeLog
index 92b86db4f395..866d48f24de8 100644
--- a/media-video/subtitleeditor/ChangeLog
+++ b/media-video/subtitleeditor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/subtitleeditor
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/ChangeLog,v 1.6 2010/03/11 13:09:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/ChangeLog,v 1.7 2010/03/25 21:46:00 eva Exp $
+
+*subtitleeditor-0.36.1 (25 Mar 2010)
+
+  25 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -subtitleeditor-0.31.0.ebuild, -subtitleeditor-0.33.0.ebuild,
+  +subtitleeditor-0.36.1.ebuild:
+  Version bump. Make sure *.la files are deleted. Clean up old revisions.
 
   11 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   subtitleeditor-0.36.0.ebuild, +files/subtitleeditor-0.36.0-r681.patch:
diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
index cf9d05428913..9f8a1ff7aeda 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -2,18 +2,16 @@
 Hash: SHA1
 
 AUX subtitleeditor-0.36.0-r681.patch 420 RMD160 5b3773489b5b395cd781ae9ed2b0cfe2e241405a SHA1 ded640b338e261f86bc7e66df1022b99a4acd126 SHA256 39d8d937e4755c2481dc165e855e52952a92152120dca8636fb024659cf704f2
-DIST subtitleeditor-0.31.0.tar.gz 1098896 RMD160 3c0ef9ac8762c9ea6bc1332e3e1812914d75a5f3 SHA1 183d892e2a5afb99d1a3d99e6d59155b4bbce61a SHA256 6cac56eabf091933ddd23d39fbefea29d0af900810e2e831c11a0b4c7027ccfc
-DIST subtitleeditor-0.33.0.tar.gz 1120158 RMD160 8fdbbc48128af1526aa590b0d7ebb44e1e26e937 SHA1 7d31c99e6da384a9b5636148f7cee79cc371d279 SHA256 a0ee98878ec69f9d641e5162ccbe81ff8f16cffdc5aab8ae4baeb036fe477f47
 DIST subtitleeditor-0.36.0.tar.gz 1199584 RMD160 ed96147c8091e46a18ffdf6f1d3106d41422d540 SHA1 d3d57378b0fcd3ca461c1a2510a1516b3b25ca87 SHA256 bd4f0a2c58dbf0f356e1cf6248ba58e3354cec8904850bb9c9665154f5be517a
-EBUILD subtitleeditor-0.31.0.ebuild 1392 RMD160 1455ee5dd4bb8242398fbd4498de2bad7a779e0a SHA1 4c2cfc4268ecff9a0ba679a784ee4ccc39768a9c SHA256 eabb875c4b57f793e66b2124ffa4c0c4df2166e4a758475eca5289b422c0d40e
-EBUILD subtitleeditor-0.33.0.ebuild 1592 RMD160 3f610479cf8697e22371f79ca87f903bde97564f SHA1 0e96d477618ebb62b37f7a1d23dfd3ab3ddeb29b SHA256 d40708709d0b2bc0c1da6f8c9da8e75a8a12562d6a907c3cdb9cacf6ff26c02c
+DIST subtitleeditor-0.36.1.tar.gz 1205312 RMD160 c796d2e01a136506b5e75324f83f7a7a587a033c SHA1 45675ae34ce504b6456246854905793564efe4bb SHA256 63861de9cf88904b705efe7d476099af0ef304340216ed74c72928bfd2230d84
 EBUILD subtitleeditor-0.36.0.ebuild 1903 RMD160 b60defe775c1a4025a517fb62311395b75680871 SHA1 8c9bfb9c705d3059f03300c573df111755b17291 SHA256 c245f60ce82b050df65318de147a8e88b2943d4b253023ea148a3468cb3d7375
-MISC ChangeLog 1625 RMD160 d67e402f3a02ab1d4f757ecb63e5c7035edcb94f SHA1 9f42db97a15e36fb5e9f54318c18417d691a9d8f SHA256 469e4c96f721d3b27c6ad06793a9c36bddf851f25c8b73dd79cc7870562d7267
+EBUILD subtitleeditor-0.36.1.ebuild 1888 RMD160 006073e0d518eaa6604e9d7a6e7fa23c023e56d5 SHA1 2d9c065da87f1413e5a13d8d2b731e85eb39d138 SHA256 98866a01edfa1808a284dc56f9c17bd22c684f506f85e2d7fe797ff41adf8dbd
+MISC ChangeLog 1883 RMD160 22d6b28ebf14b41bd9a405c4e98f5e031473fe78 SHA1 3a917f3356fb22285f86295c8c5f376437df9381 SHA256 5ac6f1fd69b9335682e06e48634633b9df3c3b036887acbfd341192cd3511058
 MISC metadata.xml 633 RMD160 7e00fdae57f03f5272fad843f52f46379fbaf503 SHA1 c06f3018039b1997ea0eaff59db634736686b93c SHA256 b0e1e281ff7cd751f87ec7c7897a850f55f62589bda8efd1d107bd8dbcb09e77
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuY63gACgkQAiZjviIA2XjdvgCfVA7WuoPpbSAtybVR7ESxP2k3
-4JIAoMBM4G2RgeTthGVEwC8MATC8oj6X
-=T0xH
+iEYEARECAAYFAkur2aQACgkQ1fmVwcYIWAaa3wCdFoQrZFmg0japYYjb4m/+AxD7
+BGYAoOdunZZyz912H+N5+VCCh3uR2iw0
+=TgEE
 -----END PGP SIGNATURE-----
diff --git a/media-video/subtitleeditor/subtitleeditor-0.31.0.ebuild b/media-video/subtitleeditor/subtitleeditor-0.31.0.ebuild
deleted file mode 100644
index 4d4030ab3902..000000000000
--- a/media-video/subtitleeditor/subtitleeditor-0.31.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.31.0.ebuild,v 1.1 2009/05/23 13:10:45 eva Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="GTK+2 subtitle editing tool."
-HOMEPAGE="http://home.gna.org/subtitleeditor/"
-SRC_URI="http://download.gna.org/${PN}/${PV%.*}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug opengl"
-
-RDEPEND=">=x11-libs/gtk+-2.12
-	>=dev-cpp/gtkmm-2.12
-	>=dev-cpp/glibmm-2.16.3
-	>=dev-cpp/libglademm-2.4
-	>=dev-cpp/libxmlpp-2.10
-	>=app-text/enchant-1.1.0
-	opengl? ( >=dev-cpp/gtkglextmm-1.2 )
-	>=media-libs/gstreamer-0.10
-	>=media-libs/gst-plugins-good-0.10
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	app-text/iso-codes"
-#>=media-plugins/gst-plugins-pango-0.10
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig"
-
-src_configure() {
-	export GST_REGISTRY="${T}/home/registry.cache.xml"
-
-	# USE="debug" seems to turn on some debug path
-	econf \
-		$(use_enable debug) \
-		$(use_enable opengl gl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If ${PN} doesn't play some video format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-}
diff --git a/media-video/subtitleeditor/subtitleeditor-0.33.0.ebuild b/media-video/subtitleeditor/subtitleeditor-0.36.1.ebuild
index e0d8eca85b8b..33357bda0c41 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.33.0.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.36.1.ebuild
@@ -1,33 +1,35 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.33.0.ebuild,v 1.2 2009/07/09 22:19:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.36.1.ebuild,v 1.1 2010/03/25 21:46:00 eva Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils versionator flag-o-matic
 
 DESCRIPTION="GTK+2 subtitle editing tool."
 HOMEPAGE="http://home.gna.org/subtitleeditor/"
-SRC_URI="http://download.gna.org/${PN}/${PV%.*}/${P}.tar.gz"
+SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug opengl"
+KEYWORDS="~amd64"
+IUSE="debug nls opengl"
 
-RDEPEND=">=x11-libs/gtk+-2.12
+RDEPEND="
+	app-text/iso-codes
 	>=dev-cpp/gtkmm-2.14
 	>=dev-cpp/glibmm-2.16.3
-	>=dev-cpp/libglademm-2.4
 	>=dev-cpp/libxmlpp-2.20
-	>=app-text/enchant-1.1.0
-	opengl? ( >=dev-cpp/gtkglextmm-1.2 )
-	>=media-libs/gstreamer-0.10
+	>=app-text/enchant-1.4
+	>=dev-cpp/gstreamermm-0.10.4
 	>=media-libs/gst-plugins-good-0.10
 	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
 	>=media-plugins/gst-plugins-pango-0.10
-	app-text/iso-codes"
+	>=media-plugins/gst-plugins-xvideo-0.10
+	opengl? ( >=dev-cpp/gtkglextmm-1.2 )
+"
 # gst-plugins-pango needed for text overlay
+# gst-plugins-xvideo needed for video output
 
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
@@ -35,21 +37,28 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
 }
 
 src_configure() {
 	export GST_REGISTRY="${T}/home/registry.cache.xml"
 
-	# USE="debug" seems to turn on some debug path
+	# Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS
+	use debug && append-flags -DDEBUG
+
 	econf \
-		$(use_enable debug) \
+		--disable-debug \
+		$(use_enable nls) \
 		$(use_enable opengl gl)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+
+	# plugins are loaded without the help of libtool files
+	find "${D}" -name '*.la' -delete || die "failed to remove *.la files"
 }
 
 pkg_postinst() {