Version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

diff --git a/media-video/minitube/ChangeLog b/media-video/minitube/ChangeLog
index f60d9d2aa41774e68c453efda6ebeb6eae0e3dba..35eaf544eedcf2293358993501213965ae1313f0 100644 (file)
--- a/media-video/minitube/ChangeLog
+++ b/media-video/minitube/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/minitube
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.100 2014/12/31 13:31:12 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/ChangeLog,v 1.101 2015/04/19 08:58:32 hwoarang Exp $
+
+*minitube-2.4 (19 Apr 2015)
+
+  19 Apr 2015; Markos Chandras <hwoarang@gentoo.org> -minitube-2.1.6.ebuild,
+  -minitube-2.2.ebuild, +minitube-2.4.ebuild:
+  Version bump
 
   31 Dec 2014; Michael Palimaka <kensington@gentoo.org> minitube-2.0.ebuild,
   minitube-2.1.6.ebuild, minitube-2.2.ebuild, minitube-2.3-r1.ebuild:

diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest
index 6464e07b65d5481ab66dde219bd9b80222eb7542..2603a19a16de3d4fbe30f727b6ab09551c5e5350 100644 (file)
--- a/media-video/minitube/Manifest
+++ b/media-video/minitube/Manifest
@@ -5,30 +5,29 @@ AUX minitube-1.9-gcc47.patch 402 SHA256 8c001adc8ead352792b14643a875d7e3910e8549
 AUX minitube-2.0-disable-updates.patch 501 SHA256 d93c27c88781c71a70ae77b8914c37c14072cc715cb292862c14f4928ac89bf7 SHA512 e689d667ef158971e8cacf574c97ff3e5b747ad3b521e348e761bf5c47ae434a48cff48e9cc7cdceffeb23e6ae1efc91a6d9a63726c7fa3fd87e19c6e0384344 WHIRLPOOL 1508c442c1ea0b7f8c40acee3a4155137ca66d6792d85e10eebc3c4ed52ac1bbc7382b2ea067e8a1a962459908a696b0da796b75f5f273db5ca6d472aebb71a1
 AUX minitube-2.1.3-disable-updates.patch 331 SHA256 4972c3436fe0b7376359f911641eb77049752b3fb1ac5555423ffcd108611c25 SHA512 1d4c01f7eebd7a048beb7f7c86559ad34b1fd0a37a4058d81d9d26b17928bbd119a9e3fb9aabd3030be7b8ee8ed2a08854a473973741ad24e3340cdaf7598c98 WHIRLPOOL b8bed4b38777ea90784fad04af93e3a73748d8066b7089d2e485916ce4ab3bc63311c3df2290dcd1d2fa73ba9fe6ffa1a068c0221390f4083fd7ba54864d87bb
 DIST minitube-2.0.tar.gz 713577 SHA256 1ba1dd7725e6e0c92653fdee7bcfa4b833346d2ef4c091d94b181b60bb592554 SHA512 f08f49549486f22d6156aa4344fd0698e03b0fcf669530010a648467cd3da1edbe6ee9e7c7578c69c7f410a03afe2e5c25bb84e6e1dc70c6534210566789f81e WHIRLPOOL 415d5b17a0862aa74c09a4950be43cd78b5ab5f26c7d0bd5d4c4b78d97989b181ecdc86955f843348b52fc582346fbae32d664f43e5ba76fcc995a59c572776b
-DIST minitube-2.1.6.tar.gz 870000 SHA256 1a9b9386f20e42274c1b13a729268f1cb8e7978d3ae930f8acdff7d3b270c724 SHA512 0e87c2139a2e51283ef63cbc3e6115014bb64894c4380101ae4df45ce55a8799830304a012b79634482ad019414ec44de8422c24d2e52d2e298e06e813131da2 WHIRLPOOL c0147648adc8f25ed99963ca65ef6896abc808e430d91589057034b5a6c844ea848b0c3a2bfae40aa61ed5d4c4060f6882c0f3ac27f213bfce29ccffb2b42ca7
-DIST minitube-2.2.tar.gz 878634 SHA256 1076981044d62e5c0b52754d34acde46be5e8bdf4813ae7cead7c9ae038133e1 SHA512 75c783f22171e56875d2d2ba3260f5402ab3c638fb84f5d0c97d3bc05597b66e45f9d8e9bdfec9c30574af1aca5e74a40ad879c8943767271414968ea98221a1 WHIRLPOOL f765de44d3597e4f1f00e6157e73553ec5180f6cc5bc26a5c116efde21c9444d5c1aa2ac232a082793ca69f1fbe1e2b35c71fcdef0ac89da842a8e2af349caa6
 DIST minitube-2.3.tar.gz 955192 SHA256 7fb24e295dc3e2f4ce41add1ef71c7b1fef57383578f46af8e271710c86c2247 SHA512 bfbd0a7bc73ba70172d3107b2c530d64764cb4e4e34aea8b33a4a9306ddc7570dcae1c33a6de07e7890142df9a39c3d4454edea0bf53d8e0ea2027fd91605d03 WHIRLPOOL 14e545cf2c2a7931a049ad6264fbd91d6f426906421ec1bbea06f96f15fd4a7678a24c106e8abd1ce17b0a2bcf1e69304c8321c3d381b872d95ae4bad81c2e40
+DIST minitube-2.4.tar.gz 984265 SHA256 1d8a427a4120d623c689969d92904bf66bf7d3edafcb0f6f9eb7f24d6db39c7b SHA512 45a90322540a281b337511af5e52a25bb5d908d3e37b6d7d4a068a2cb0d598095b6a312f862c7043851ceeda63c66944213646ba154ae505229da7fbe48251dc WHIRLPOOL 932ebcbf2397ceba78af6823f6eeb56edbf9b4c58dfd15218d10572d6a47110867b969b4711a1bcc0a00d3d47361ddec3c98fea7f69d5b56db40b842dba57b97
 EBUILD minitube-2.0.ebuild 1612 SHA256 e51f7d964235c97a4d9aa1185ecd9c6fc3bf558f1762fe7214dbff2d4806438b SHA512 0c137c00dfb48d697c94def901eceeed15606e4d58b2662bddabd1db83b499a7b3535e1283a0e233227498e97fb6fc5f21f7358eaf9e854ab23414fa8224dd53 WHIRLPOOL c8c528e1effe6c139f296fe9e7f1069df61bcf01c25c09efead3c78f1660737517df93c91ade2a135dad46752f2edb1b4cb7e97fd08d98ca6e0bc64e9d31de1b
-EBUILD minitube-2.1.6.ebuild 2266 SHA256 a81257c7b3d5ffc8029d3b6c5eef77eb17ef38141244b08d65ad9c56ee62934f SHA512 2e869f87f0fa0f3caa573b3a99d2f7a054f5ef518894ba631c5b3f0764b0bc651a367a5908e28d49c5e7d55d02d90ac0905b5e97b58470f12d86aa15dbc77feb WHIRLPOOL 74ae27833c0ede562b6b79b81620c39fb5848990862fce928cebd5eaf8bd0c61db052daed8b9e9c72a2af8497fd50b83a1b8db147faacb805975359b57d918b5
-EBUILD minitube-2.2.ebuild 2264 SHA256 51105b0407ff3a4528ab5779f51db21d39aadaf4e53e6c767ccc99ee6a2b1579 SHA512 f26bf33529cecc4f19a71ddf929ca1b37b54c8c88008fe3f09c207b01c3dd3dfb00c671c9445d725f442c0a8a821e6cfcef15e25d7e3ceb7816edac2b4dc58a5 WHIRLPOOL dca77b5a60ca8ab29d09013ef7e4184c1679eb7d31b2129f13c75d5c312af7fa0a8db5bd5b3dac112f93fdca66fabc5a16f0c436c3c89ca543b1b660092fbc9a
 EBUILD minitube-2.3-r1.ebuild 2341 SHA256 04ee2b2625faee0127071dc8a322dc81a42a07655c99f2533a45bfa96e0d3d4d SHA512 0f5bdc319060b96844e3caf54670f273d964b53e0433b40274bc715a78a066f6c3a12c9ddada67d80e19d77ad64718bc146e66e5507c21c9b692a3b3cfacf15c WHIRLPOOL 269d716f22389d5d2c86e7ec7b3af9c0d80b43c3698bbd379ee6f7e2653c6236585dba0126f46001fae82ba9c236e43f23bcabe1eb6f4f050f11aad176c8fe8d
-MISC ChangeLog 14530 SHA256 eef4c4b9756bf0a167b0bdbe012d40938ffe3a956befc6654d7c1ea7fc3a80a0 SHA512 c217186986ee05fbc7507e7908992e8515e1a9b637144886a39f9275133cdda7c027667de76df3436c315283cb08581290b5d8fa76898acdb360f5a422812920 WHIRLPOOL 548583a45db0bcfb75d99359e54f29232f5316ed73341a62cdb4094f754cf1fbe43e423748b7313646eacfab32b33b6e968defd0c6aecffe0d4243be194dec1c
+EBUILD minitube-2.4.ebuild 3006 SHA256 3efb38eb9905b6741ed949efeb2803fd94cfeed17195c5ad35587d7e29b802e1 SHA512 c3b0b5a6c645fff3bdd747793565643e4468adda7f83d1336ebafd72425f55fa07c9d76929baaf0c8861110717619cc43dc722a66b975d77bff71b48ee30cf31 WHIRLPOOL 5b2385d5eb409eca0fa3993134e54eeb0ca98fb8b944396e62f32993b0e6834791c90587e8dbe2242520db3798fc9eae982a4c4dda5d02a27d9738b156d6f332
+MISC ChangeLog 14696 SHA256 5d90f2756a30c9e75e75e2b2c540ca15d4c048e13d82b49266c12d114a69515b SHA512 9eb8900976f75f11eb132fcc71ced6268627a0178060c2f92692bf731bbf331c8c6a7c2d8ed82a86d454c17deb2f17ca413568824a671c86a5abb62472063ca0 WHIRLPOOL 7dce4295d4e2109086359a4014e8c01f27dc6b98675d050298930b8d9cd7f2c743b1d3aa2377ba541e3a8e6e1fb9fc5ede509ac7d99760e190304b43819adf74
 MISC metadata.xml 365 SHA256 787bfdbffa3c66857401088746db6b088e6978b135ffcbfb74d616fcbb223797 SHA512 383a31000daba792686a14f5594c6704295163a5b09730d5e8ed894bdbb595b9311b27c233e73e530ec1f7f8a2dca5fddf453159ec94f208bb5f300df0afd399 WHIRLPOOL fc3e39f5aed637fb4e83220153a104443f2d50297f50581771f77351812c3ddba6b223b30e064d27c5c6598eff4c2445897603cea05a98422a4884c6acf081a6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJiBAEBCABMBQJUo/qzRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7JlWD/91QeOVYI6h06xxrrfPKPhhXhbpMDI9BzCzVp3bwWeYKsfu8jGivZIooRoH
-HyyTarBJYBfko7aqQHO3hB7Xx8zhlwh5Il0fIcMjtS4dvRxIhcEIXcj2A6NhT5M1
-NGtohD4C53cPnQ2uStNspQ7OEy/psbIt32G8mFV/PgQ7oKKiNKfSi0R9pGPH808H
-KKZS4Jf4KHEp1swMt42w9wrBcvRJGp0fdn28cUwf+5O1AoptsJ9cTQbIwehCUfvf
-CIKiuhDSQw85z3I+vKudQTf21DCowYRW3ZP1h7DHMs7kk+gLNvzfHbQT0I0iCm4S
-7V7gYSlhza50VnebVvEhUN6YGd/HUzY9/FWo8khwqyn4Rt5lq0XZn/IjedrkSCZY
-GGFoiE18dpw4MaZ1br7XqBc+xiez2K6P14OCd7qxXA5TIfx79sANnlk+SKluL1Pq
-yb4ec5HlRuVSASc34ytCeN64oueDof9DgREh6AC94dfrWOtJ30gVtW/XoSEBff7p
-NDq6lGDkz4shZLV25wYh5tRMecoozyJMprQ16q+LTp7Ob9outOfunTsgDu5ae3xj
-/ZZ2j9XtBMqDgDeR7YLWKpqbD5vDcukUTKGGPgjqbxRcRJnWrZ90ktgtDVADSKDI
-zH4WTkqO/IJGhSAgopbXxQA1rgzroCWAhHU9j4Mr8EKdleoVNw==
-=5/5v
+iQJ8BAEBCABmBQJVM244XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88I+gP/3YAr/EO2xSyRoGzZ9E+17TZ
+knp0PTu3pXqHtPUiCN0p651yhg2bNoDRCh72KiisWuPBO4Y5uBaq4Ll+qpZrb5cW
+hHRjFxPl/rMNC+7sLrDzwBQH3q6ag4hBoSzVKX0OOJbDmhETHYwpekuMrVoJSHQi
+nRg/g3hcMzNjHiNRk7EfIWKmiB6veNhk7pEH4rLo4xu/bx2Og9DUuflXPj7EVH5H
+sMLL+pLjBYt85WUvWXWtaOoJ9dZhCEC94jvMAYQHcPa7ysZrjXnzOAVv9lsnlVTt
+/8cNBRPeA4QCX7xVQ1aUpI9SSMQfgA4N77MxLWWiQJcvI+JFjbmCH3VQOm5EG4GW
+rDoAontJ3VFpHqM5U/6Xy+UKp5nss8Gg5pKG9FXWbOaVkAtrhmIuf52gOWrLZAVK
+6c7Hucs3ZjLEFsMCnZvGTPXqiyIXiB+gvNpbBgYfhKZxdwbvmLR1xayMsl3uv4EA
+DUVRSH5lJbnUNsH8OapyXcFFNcuJRaRGHxUNXkQ0B1Xz8kNLp6M1ClPsm3xX+WVe
+B5s8vu+d/GjooN4MRHp+VazrIS0i0uo7JGx1LHhNCeHHMMDttRvWb03buFqRkXRd
+Y+Y9FPKV22wNn9keTtDBG7h+Jfc2fQf02jY/jtdlEFGb5bCVK4VvDAekYjdBMRru
+0/HVCZzUdFFwEK6BhxvJ
+=wuUV
 -----END PGP SIGNATURE-----

diff --git a/media-video/minitube/minitube-2.2.ebuild b/media-video/minitube/minitube-2.2.ebuild
deleted file mode 100644 (file)
index c1a4137..0000000
--- a/media-video/minitube/minitube-2.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-2.2.ebuild,v 1.2 2014/12/31 13:31:12 kensington Exp $
-
-EAPI=5
-PLOCALES="ar ca ca_ES da de_DE el en es es_AR es_ES fi fi_FI fr he_IL hr hu
-ia it jv nl pl pl_PL pt_BR ro ru sk sl tr zh_CN"
-PLOCALE_BACKUP="en"
-
-inherit l10n qt4-r2
-
-DESCRIPTION="Qt4 YouTube Client"
-HOMEPAGE="http://flavio.tordini.org/minitube"
-# As usual, upstream never releases proper tarballs
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug download gstreamer kde"
-
-DEPEND=">=dev-qt/qtgui-4.8:4[accessibility]
-       >=dev-qt/qtdbus-4.8:4
-       >=dev-qt/qtsql-4.8:4
-       kde? ( || ( media-libs/phonon[gstreamer?,qt4] >=dev-qt/qtphonon-4.8:4 ) )
-       !kde? ( || ( >=dev-qt/qtphonon-4.8:4 media-libs/phonon[gstreamer?,qt4] ) )
-       gstreamer? (
-               media-plugins/gst-plugins-soup:0.10
-               media-plugins/gst-plugins-ffmpeg:0.10
-               media-plugins/gst-plugins-faac:0.10
-               media-plugins/gst-plugins-faad:0.10
-               media-plugins/gst-plugins-theora
-       )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-DOCS="AUTHORS CHANGES TODO"
-
-#455976
-PATCHES=( "${FILESDIR}"/${PN}-2.1.3-disable-updates.patch )
-
-src_prepare() {
-       qt4-r2_src_prepare
-
-       # Remove unneeded translations
-       local trans=
-       for x in $(l10n_get_locales); do
-               trans+="${x}.ts "
-       done
-       if [[ -n ${trans} ]]; then
-               sed -i -e "/^TRANSLATIONS/s/+=.*/+=${trans}/" locale/locale.pri || die
-       fi
-       # gcc-4.7. Bug #422977. Will probably be fixed
-       # once ubuntu moves to gcc-4.7
-       epatch "${FILESDIR}"/${PN}-1.9-gcc47.patch
-       # Enable video downloads. Bug #491344
-       use download && { echo "DEFINES += APP_DOWNLOADS" >> ${PN}.pro; }
-}
-
-src_install() {
-       qt4-r2_src_install
-       newicon images/app.png minitube.png
-}
-
-pkg_postinst() {
-       if use download; then
-               elog "You activated the 'download' USE flag. This allows you to"
-               elog "download videos from youtube, which might violate the youtube"
-               elog "terms-of-service (TOS) in some legislations. If downloading"
-               elog "youtube-videos is not allowed in your legislation, please"
-               elog "disable the 'download' use flag. For details on the youtube TOS,"
-               elog "see http://www.youtube.com/t/terms"
-       fi
-}

diff --git a/media-video/minitube/minitube-2.1.6.ebuild b/media-video/minitube/minitube-2.4.ebuild
similarity index 63%
rename from media-video/minitube/minitube-2.1.6.ebuild
rename to media-video/minitube/minitube-2.4.ebuild
index e23de0c86c7f6b4722dff3de2b971161da1145c3..8bedcc1b154d84416245f94c4562478a87e66ea6 100644 (file)
--- a/media-video/minitube/minitube-2.1.6.ebuild
+++ b/media-video/minitube/minitube-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-2.1.6.ebuild,v 1.2 2014/12/31 13:31:12 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/minitube/minitube-2.4.ebuild,v 1.1 2015/04/19 08:58:32 hwoarang Exp $
 
 EAPI=5
 PLOCALES="ar ca ca_ES da de_DE el en es es_AR es_ES fi fi_FI fr he_IL hr hu
@@ -11,8 +11,8 @@ inherit l10n qt4-r2
 
 DESCRIPTION="Qt4 YouTube Client"
 HOMEPAGE="http://flavio.tordini.org/minitube"
-# As usual, upstream never releases proper tarballs
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+SRC_URI="https://github.com/flaviotordini/${PN}/archive/${PV}.tar.gz ->
+${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -31,16 +31,31 @@ DEPEND=">=dev-qt/qtgui-4.8:4[accessibility]
                media-plugins/gst-plugins-faad:0.10
                media-plugins/gst-plugins-theora
        )
+       dev-qt/qtsingleapplication[X]
 "
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
-
 DOCS="AUTHORS CHANGES TODO"
 
 #455976
 PATCHES=( "${FILESDIR}"/${PN}-2.1.3-disable-updates.patch )
 
+pkg_pretend() {
+       if [[ -z ${MINITUBE_GOOGLE_API_KEY} ]]; then
+               eerror ""
+               eerror "Since version 2.4, you need to generate a Google API Key to use"
+               eerror "with this application. Please head over to"
+               eerror "https://console.developers.google.com/ and"
+               eerror "https://github.com/flaviotordini/minitube/blob/master/README.md"
+               eerror "for more information. Once you have generated your key,"
+               eerror "please export to to your environment ie :"
+               eerror "'export MINITUBE_GOOGLE_API_KEY=\"YourAPIKeyHere\""
+               eerror "and then try to merge this package again"
+               eerror ""
+               die "MINITUBE_GOOGLE_API_KEY env variable not defined!"
+       fi
+}
+
 src_prepare() {
        qt4-r2_src_prepare
 
@@ -52,11 +67,12 @@ src_prepare() {
        if [[ -n ${trans} ]]; then
                sed -i -e "/^TRANSLATIONS/s/+=.*/+=${trans}/" locale/locale.pri || die
        fi
-       # gcc-4.7. Bug #422977. Will probably be fixed
-       # once ubuntu moves to gcc-4.7
-       epatch "${FILESDIR}"/${PN}-1.9-gcc47.patch
+       sed -i \
+               's|include(src/qtsingleapplication/qtsingleapplication.pri)|CONFIG += qtsingleapplication|g' \
+               ${PN}.pro || die "Failed to unbundle qtsingleapplication"
        # Enable video downloads. Bug #491344
        use download && { echo "DEFINES += APP_DOWNLOADS" >> ${PN}.pro; }
+       echo "DEFINES += APP_GOOGLE_API_KEY=${MINITUBE_GOOGLE_API_KEY}" >> ${PN}.pro
 }
 
 src_install() {