Version bump with various bugfixes. Make LICENSE more precise. Drop old.

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64

8 files changed, 56 insertions, 185 deletions

diff --git a/dev-libs/totem-pl-parser/ChangeLog b/dev-libs/totem-pl-parser/ChangeLog
index f50520e2e883..a6fcf2e808cd 100644
--- a/dev-libs/totem-pl-parser/ChangeLog
+++ b/dev-libs/totem-pl-parser/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/totem-pl-parser
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.115 2012/05/21 15:13:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.116 2012/09/18 10:14:05 tetromino Exp $
+
+*totem-pl-parser-3.4.3 (18 Sep 2012)
+
+  18 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -totem-pl-parser-2.32.3.ebuild, -totem-pl-parser-2.32.5.ebuild,
+  -totem-pl-parser-2.32.5-r1.ebuild, totem-pl-parser-2.32.6.ebuild,
+  totem-pl-parser-2.32.6-r1.ebuild, totem-pl-parser-3.4.2.ebuild,
+  +totem-pl-parser-3.4.3.ebuild:
+  Version bump with various bugfixes. Make LICENSE more precise. Drop old.
 
   21 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   totem-pl-parser-3.4.2.ebuild:
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index c182b1c83caf..6c085d4a1fb1 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,15 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX totem-pl-parser-2.32.3-fix-quvi.patch 786 SHA256 a891cc4bda5a94cbbdde031f0ee05cbb1fdd0f53c09710c366a5a6bc9787257a SHA512 d53e83c68544cabd4b3b6bc39ea3bef591c96e413f574c334704c610d1a5a87eedea59e002ae1aeddcf5a7cc64a9049af316481796a3a60afcbed673538a816b WHIRLPOOL 7220a2386342e755e11d00607026367dd26a6b567c8665fa792c23ea857b37f3448e11e979343d307c894c052c5ebd036fe5cdaaf56a547bf1ef2630b3b7e250
 AUX totem-pl-parser-2.32.6-quvi-0.4.patch 850 SHA256 0ddded34923431dd356519f57c7d7fcaff44411a8c95b06fb0f32ac43b0198b3 SHA512 e7a075ea6c37fe78304b83c834914ffa895e0b580b268aa689bd4b387eb9276f30dfca94b527f3f5ad9137bb24639d26a4f765e5bd5f5bb905fff967f04e658f WHIRLPOOL e0a13fc24e614acad95be51a00a92ea1f8e92ac69acf2c8428ed26f764823b94b531d05db3e9d73604186792cab6bb1a3b0ddb89bc86735db6af0cb776fce23b
-DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500
-DIST totem-pl-parser-2.32.3.tar.bz2 1586596 SHA256 c15149650c5420426e7becd6eb4298e898d1975cb7c9ff534cc0785d350916e2 SHA512 4e3b673e9744994a0309c4d9f0ca315aba0697a01c72359a36d0e360fe521bea58dd9349e75894926e11f66369e3bf78220f9a4fdc39ccc1050cfefd65a569c3 WHIRLPOOL a3dd3d43f4dafd10a02fd56d5d8df62b1ea4551e2755c7972d59535a03e3df9c9451120e835972d15fb79973891481e61519f7da66d9e43549bb1544690fbae5
-DIST totem-pl-parser-2.32.5.tar.bz2 1605159 SHA256 f7233972602321db5e46819a5b47b52c10b63c4344725a5179ac956284e1991d SHA512 277c6ab18ccd56aaa031a01ec464a5163aa63ba8a628fcb941805d6b7a665f00708dcaad57aa19f5e56b2de093480db2906205108152c23124b9876fcf7725fb WHIRLPOOL 490df9a1d5b7cce99c8a9c0975c895545f1e65cd7a3aa7391e398ef1a6302c95282c127730251c3352b7d2dffbd7320b989679a6ce5b1a675e422fb9af989e92
 DIST totem-pl-parser-2.32.6.tar.xz 1438372 SHA256 8e6ccef547f1ad311474a975032d2482e621550ee3d4d22c725cdc6b496e4874 SHA512 25726fd95815955b5f8b6fc35cc906f9dcd3818a17f0113e8fcc3240b4fadbaabfcfe91d463ef2d69062cd19a9b6a665342a14a88d781ab70929ac40add07ac3 WHIRLPOOL 1e924e1ff461aac1259a3cd10cefe8b11dbf59f8a676004f5023abb5da623bed520c07937ea802f619a9a33f47a47f2014cbd5ed5795befe35abc8e1bc8986e9
 DIST totem-pl-parser-3.4.2.tar.xz 1452392 SHA256 7b336f599610898beca8238408c9c8e1f1f264602cefb2d1f5601acf9a261ecd SHA512 61c3522e0611ca7d3f57f69f743a49a8cdfcb6f57bc087e3e17b1e8e82a7c43e8ee6d4c13007a3e2286df23c264effec2e2a8771255abd5434be0238e774b1a0 WHIRLPOOL 8db6bd24d3282840df0f4fc3d6aed51cf76cff4f7d9f86413742d7226ec8d763238deaed7b7c5d6dbb0e637e4e2ed683f9b3c8fff3e8aaeae58d85196c9370c6
-EBUILD totem-pl-parser-2.32.3.ebuild 1943 SHA256 905c94e621a83eba411a3ea4fc537da601ff45b9e393bc66977ee18e82b00a9c SHA512 ce70657039bbd21bf29b26397b142b245d7cc592a6ab0006a29844d89acaac1a118220a89a4555aca4ee6e6c72b487408b095aac5589b99b12287afa2947eb11 WHIRLPOOL b50eb8279863b119b1209754ebf2e8b252dba03ceb3a192f1c50bb1d735315c9f59267172b6c9199e1f26221f99930ac931b083d368450ac06931fec13a6da5d
-EBUILD totem-pl-parser-2.32.5-r1.ebuild 1844 SHA256 f7011be7ae1851c19f53857a872f8197590229669e26bd12599e881f9b73d8d2 SHA512 6bfddfa0f8834b9252c7c59e6eae157bfd0a91f17b4537894d9cc0428885199ad7ccccadd17107c447b37c0ebbc85dd76599fb55db7083502c6c74ce23e0dcef WHIRLPOOL 900ee8f79fe8d0f2ce4a785741c396eb1f115472353db0ad7a323fb70b763ec4f939e6744b7d8d1b219be680a5c3e4f62a44f0426b5c9803e3f2f6a23639ac3f
-EBUILD totem-pl-parser-2.32.5.ebuild 1835 SHA256 c7cf659b3ef5a00662951ccd83b03f442c827ffdca5de2275ed014f3093f54f6 SHA512 8007cb0585711bc2d198aaeaa47cc4d48757bad67235f3267dd0b2697fffbf86789d0ceff6886ee5dea080fd6209cd32f9c158ed8029973937e8cee7960cc87d WHIRLPOOL 8c69f386ba3a253e8cfedaa113c7bdad54b068e336d01900df713d31fbdcf96f3d4dc624c7a57acb1707077e7d94eee232adae9469550dc0d8a59e238a9b11c2
-EBUILD totem-pl-parser-2.32.6-r1.ebuild 2004 SHA256 0c3f2844983f40a6e4759882dc5b3717aa5997307c85a97875cfa2bf984f5524 SHA512 634f890a117a19a97bc866d305139cc164a6cdb4dc7a12f11d4db26183703145f4333a61f0f3cd47d9fa666d86c7b537d691c088c12baccf97fd9b7810f1700c WHIRLPOOL 640852cd16cb8ae8e1139dc105a71e89b99d87e6a686c02b49e125ecaa6a65dfd0761479d22e65f955b990219c102aa28138501e54907354540f04d110b2d7e2
-EBUILD totem-pl-parser-2.32.6.ebuild 1884 SHA256 3cd1e34d099e5102eb1a44a7ed99eb506374ff57a1955545a3699f577e0f84a5 SHA512 da221c705a2e1b8a46a5badb08d7161478ff044234006e3b1fbf07d21e756c67ab48867d43e7982a7a54705f652b2fc451f45ab2ce192a69b506d148d62d81f9 WHIRLPOOL 98a061011a7bd1494612e4ad376e0ee34752445fdc6ff39bb3bd736b86962b632a87a197a38d304f2087eb479039d2b13623ed95feafd7ee6ea8ac032976e2d2
-EBUILD totem-pl-parser-3.4.2.ebuild 1954 SHA256 2dad71735594c480a5b9a6f63982433f096cdd7611d2701c0e60e59d15b09bbf SHA512 dcd04595481c359315c3f999625c6b4d6919459cc532f4bc42f8fa6b71de201e8c613f8f6cfff3e1f85bf3387b8a852a2364ac40e993b555831e9f6e95e210f7 WHIRLPOOL c17dbd31365030676ccfc31b06f0cacaaeef8f11002b38068692c4642a60d6c06232c74e4b16f0549701743d2b7cb430fe48e06b52bce4b768a9e7a530608988
-MISC ChangeLog 18826 SHA256 67ce00a8f2b1360e2e4729d2e44e7f5a8a245d23011b3a3d3aee3b41a35ea5c6 SHA512 c13c4a244a5ee6097dfb4a0b33d2d9cb92e8fa9501fc2321f2cec0200abd4707aed9c9c88f5ffe35b681a13a4273275ce9707620d51fea853398480aca611048 WHIRLPOOL ae8148b6297bb4e0c1e5e6ede7edc58f1382608e596bc9393bba1018a464e9e2d1c43bc380f40d13c55a1ec0ae451a30cec723780921ed2f6f70ab76cff36504
+DIST totem-pl-parser-3.4.3.tar.xz 1602000 SHA256 ab8beed4dd5d3a5d7ed5dc8b357e94dc03a8553fef6e33c2e7fb63a76e44c42b SHA512 19ecc0aab4ce486cfbe5bd6390467fb1e14279708aaeb831f8626f7350c8b8deaa59157f95f746cfd4ac8d87a496977f558fce605bed4647f877d05dc0b0ebe6 WHIRLPOOL 7b1e654dc96e07d690309662d039cacd71c6ddc9d4856f4819be33024db02ddbd88a3d87e43ee486716f9c58256cd61a701c99d541d996085c1405dc7df15f40
+EBUILD totem-pl-parser-2.32.6-r1.ebuild 2007 SHA256 3c80a6b6ea0645e921e86b23b8b81d4b0f354e5b13aac2af2be49bcf73ddb46f SHA512 b324ae1372b53db3569cb0d376a057d97075029b5fe3b12cc98f1c4a93ebaf973398ec2c654a41681e64e68ba437d2ba3149736bf4b65f538a4b09aabf93433e WHIRLPOOL b381c2c8d61a474025bebe61bee54b25469f4fdcd725b7b8ec36bc07f193709c44a6b60f9eca7c513b8a847915676e1745b28c57a34c5c8580834b329d51f38c
+EBUILD totem-pl-parser-2.32.6.ebuild 1887 SHA256 5bfcbbea5fb7c6deee990e6ecc953bc08dabd83ed5d701c0460fbecd7364746c SHA512 15a3e7d301978d56f15682f2791327bc9c44f9cd238ca3c44e10f8184d10d8f783104c4ebdc6080ca99fa65bd1401741d6f37ed98e3fe8759879686a97d3bc82 WHIRLPOOL a6ed43123a1f2aa9f395eaf9279765304dc2e7561a6b71cba50c341a73c0310c69f8bd607839ea21666a288a6f35210a010c56ab7bb14677b27e71158630d700
+EBUILD totem-pl-parser-3.4.2.ebuild 1955 SHA256 abd57e8212e004edbbcec498b4077240b3b831f23fea3a616d78cf771848f884 SHA512 467a1c96673b771129efcd77ce6088088df9c6c07903060769e73f9d65be4af617789091609647eb4ab16db298603c78e95fc3759db1dcdfe5e3c1b8f78fdd50 WHIRLPOOL cc4da48deec922f438ab3a6d7d3d4a1a5416db1ef571b61511f8ffe17c5434ae15ec54e2910f00404370346c5f21241851fb5e415255fc44447d52a529e4e332
+EBUILD totem-pl-parser-3.4.3.ebuild 1737 SHA256 b8727b6f8f642f2d0f47e287932c0d7e424558911bffd77c505a865c8ca71dc1 SHA512 554ea80f6997ee759ed7981456215edff8d9a330c30ef7929acdf04c2e2cc822c9448dba2b8179a7d773953ba8ed716bb507c9713d86ffd88f20c692217623d7 WHIRLPOOL 04ba6ce7c433b7246e9ef803c554bad7fb88d1e2dd350c058485c603017097b81e9a978b9f0065030fcd6204727ad27adff1fbd61fa5adb31896ded3e1caa835
+MISC ChangeLog 19232 SHA256 13fb1188ab4839e7ca8e8e39d7fb5a76b0eed94e9f7a08267f2d4569b1191712 SHA512 e2d936b0ad585f3d3bc53de05425e1c3dc9ba99de3c1200d913b24bfed081aa51905a5d4cb369c215126e096d94a1581462e09e867588ca57e80da2abe5f2f11 WHIRLPOOL 766d83572018cd2c7bd660b980afc4afa7767a284e829f6d86f9c44f63f0b7709e49d47bbd80691e2b9fd347314863b4929ab2a5e2f5b5f906b5837e1f162364
 MISC metadata.xml 492 SHA256 43d02e4dc81f8f531e19376c0107031953d50ca59d0c80602f8b8838b482f0e9 SHA512 4d0ff77ed81b37b60aebcf1a35b3f8177bb6478a9832e684240332a8d6c823dbf24b14b4bfcb42b08170e7caae854217bfbdf3d92c841d8728372f51a3336e82 WHIRLPOOL feccdcd78aa9c94bf798e94ffa8931ab8e70ec79c121e03ed2f447bf4fa432a06d73d4ecfc5c6edd3c296a1455764364e62db3e175869fc59d932a0f20bc44e6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQWElzAAoJEJ0WA1zPCt1hyj0H/jrbPSv9Ho/a9JGTu211wbsf
+AlCGZt5ormQTmTnQyHqIV7kJI2rhPjrbh3KmI9Cg1hS6SyZ1okyZjBdsWJ+Wm3ZQ
+MaawBF+p1vmBmb/Pfh3FrHS8VgNUT0VxXysQTmH/4RksPw03KexpNmIo9HRbW523
+EiWrYuery5xmkl8zqAPES/lHak8DK3MaCgSf6ONGpdN9XYyQFE4wK97FD360l5pZ
+9666iYOZTsfIAi8R5UGH0uAQqSp2zXDdAIHXHSUVGGTBZ3BzYff3B9KuuaTOhPP3
+obTX131ctM7H9WB6WC7cjbyvaaNuL9Gqq5a/mXHlBLXbh9fCvzlB++U904f0aAo=
+=fSGR
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild
deleted file mode 100644
index 9685dc42e63b..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild,v 1.11 2011/06/05 11:58:02 eva Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://projects.gnome.org/totem/"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc +introspection"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	dev-libs/gmime:2.4
-	>=net-libs/libsoup-gnome-2.30:2.4
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-
-# FIXME: quvi support disabled due upstream bug #642906
-#       quvi? ( >=media-libs/quvi-0.2.11 )"
-
-DEPEND="${RDEPEND}
-	!<media-video/totem-2.21
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	>=dev-util/gtk-doc-am-1.11
-	doc? ( >=dev-util/gtk-doc-1.11 )
-"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.11
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-quvi
-		$(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS"
-}
-
-src_unpack() {
-	# If gobject-introspection is installed, we don't need the extra .m4
-	if has_version "dev-libs/gobject-introspection"; then
-		unpack ${P}.tar.bz2
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Disable tests requiring network access, bug #346127
-	sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
-		-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
-		-i plparse/tests/parser.c || die "sed failed"
-
-	# Fix --enable-quvi option
-	epatch "${FILESDIR}/${P}-fix-quvi.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	AT_M4DIR=${WORKDIR} eautoreconf
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	dbus-launch emake check || die "emake check failed"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5-r1.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5-r1.ebuild
deleted file mode 100644
index 14600dd419f0..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5-r1.ebuild,v 1.1 2011/08/16 22:28:25 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://projects.gnome.org/totem/"
-
-# eautoreconf needs:
-#SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="archive doc +introspection +quvi"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	dev-libs/gmime:2.4
-	>=net-libs/libsoup-gnome-2.30:2.4
-	archive? ( >=app-arch/libarchive-2.8.4 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	quvi? ( >=media-libs/quvi-0.2.15 )"
-DEPEND="${RDEPEND}
-	!<media-video/totem-2.21
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.11
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable archive libarchive)
-		$(use_enable quvi)
-		$(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS"
-}
-
-# eautoreconf needs:
-#src_unpack() {
-#	# If gobject-introspection is installed, we don't need the extra .m4
-#	if has_version "dev-libs/gobject-introspection"; then
-#		unpack ${P}.tar.bz2
-#	else
-#		unpack ${A}
-#	fi
-#}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Disable tests requiring network access, bug #346127
-	sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
-		-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
-		-i plparse/tests/parser.c || die "sed failed"
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	dbus-launch emake check || die "emake check failed"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild
index 77cebdcca95e..13aa2371b016 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild,v 1.6 2012/03/25 15:51:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6-r1.ebuild,v 1.7 2012/09/18 10:14:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-p
 # eautoreconf needs:
 #SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 sparc x86 ~x86-fbsd"
 IUSE="archive doc +introspection +quvi"
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6.ebuild
index d831c8f55921..cf83d2f0014d 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6.ebuild,v 1.6 2011/10/30 15:17:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.6.ebuild,v 1.7 2012/09/18 10:14:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-p
 # eautoreconf needs:
 #SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="archive doc +introspection +quvi"
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild
index 2fdb324a069d..ed7b84f03681 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild,v 1.2 2012/05/21 15:13:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-3.4.2.ebuild,v 1.3 2012/09/18 10:14:04 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="Playlist parsing library"
 HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sparc ~x86 ~x86-fbsd"
 IUSE="archive crypt doc +introspection +quvi test"
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild
index 29681c9fbf6a..ea17b40852bb 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild
@@ -1,58 +1,51 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.5.ebuild,v 1.7 2011/10/05 16:57:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-3.4.3.ebuild,v 1.1 2012/09/18 10:14:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2
 
 DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://projects.gnome.org/totem/"
+HOMEPAGE="http://projects.gnome.org/totem/ http://developer.gnome.org/totem-pl-parser/stable/"
 
-# eautoreconf needs:
-#SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="archive doc +introspection +quvi"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sparc ~x86 ~x86-fbsd"
+IUSE="archive crypt doc +introspection +quvi test"
 
-RDEPEND=">=dev-libs/glib-2.24:2
+RDEPEND=">=dev-libs/glib-2.31:2
 	dev-libs/gmime:2.4
 	>=net-libs/libsoup-gnome-2.30:2.4
 	archive? ( >=app-arch/libarchive-2.8.4 )
+	crypt? ( dev-libs/libgcrypt )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	quvi? ( >=media-libs/quvi-0.2.15 )"
+	quvi? ( >=media-libs/libquvi-0.2.15 )"
 DEPEND="${RDEPEND}
 	!<media-video/totem-2.21
-	>=sys-devel/gettext-0.17
 	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.14 )
+	test? (
+		gnome-base/gvfs[http]
+		sys-apps/dbus )"
 # eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.11
+#	>=dev-util/gtk-doc-am-1.14
 
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
+		--disable-maintainer-mode
 		$(use_enable archive libarchive)
+		$(use_enable crypt libgcrypt)
 		$(use_enable quvi)
 		$(use_enable introspection)"
 	DOCS="AUTHORS ChangeLog NEWS"
 }
 
-# eautoreconf needs:
-#src_unpack() {
-#	# If gobject-introspection is installed, we don't need the extra .m4
-#	if has_version "dev-libs/gobject-introspection"; then
-#		unpack ${P}.tar.bz2
-#	else
-#		unpack ${A}
-#	fi
-#}
-
 src_prepare() {
 	gnome2_src_prepare
 
@@ -64,5 +57,5 @@ src_prepare() {
 
 src_test() {
 	# This is required as told by upstream in bgo#629542
-	dbus-launch emake check || die "emake check failed"
+	GVFS_DISABLE_FUSE=1 dbus-launch emake check || die "emake check failed"
 }