From b6dd5349d481634e89c1952c0c3430a5cdf9db4d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 1 Aug 2017 00:09:48 +0200 Subject: net-im/psi: Drop old Package-Manager: Portage-2.3.6, Repoman-2.3.1 --- net-im/psi/Manifest | 14 --- net-im/psi/files/psi-0.14-drop-debug-cflags.patch | 35 ------ net-im/psi/files/psi-0.15-qconf-2.patch | 87 --------------- net-im/psi/psi-0.15.ebuild | 130 ---------------------- 4 files changed, 266 deletions(-) delete mode 100644 net-im/psi/files/psi-0.14-drop-debug-cflags.patch delete mode 100644 net-im/psi/files/psi-0.15-qconf-2.patch delete mode 100644 net-im/psi/psi-0.15.ebuild diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest index 0657c8710cb4..4890f31fdc4e 100644 --- a/net-im/psi/Manifest +++ b/net-im/psi/Manifest @@ -1,16 +1,2 @@ -DIST psi-0.15.tar.bz2 1984777 SHA256 593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6 SHA512 17e972adc8dfc541977e3717c21eb694f4e1268e4719e97432f260682867290d7034b98a345b6efd73026f98a425493e9159fef9c0e0af4c83b02e07d29a704a WHIRLPOOL 6a8953fe22342dca7347af78da3ea80d5a61a14caa6d62d6910b81730b07b76f156d8d5e1331b2a96dabe5a261353da7af565d999bc7246c25d0d88e010fd983 -DIST psi-0.15_be.qm 255759 SHA256 0e9dbd9e4e738c8fcdd098dde4a17042600b35346a26d2176caa85f6253b6eb6 SHA512 90d623abe9f031af83185fc76d35d5ac390cd726490c6722bdf9ea5b1a6e0179aca650c230280a6390cc121d0e18cb9e2bd1bfd75d9e817eb4e8584d844ed3ad WHIRLPOOL f9d531127f861e5a07659f71433a12cd1d8ad6b805efb83e2d94d219c1e718a28f1390d7025122cdc94d563de99f8f245f4c8ab0297f622ad5712cc6eb4b9667 -DIST psi-0.15_cs.qm 242386 SHA256 d579a7059466c11d4264d8197188a9be49b82e2af35405053ea772c0edea6718 SHA512 46eb273794a99045702f52e10aae2122dfd3db5a49bf68b27e36bf8a1443d8dfbdbcdf550dd0ac3e3ff3014e52010682880f7e883f0d1a0d41d8a678d1e16f2f WHIRLPOOL d2ae4a6045ea1072045032a726927439fe57ae8dfad813f718dd230b36a794945e0600ad1a55f0ac74d73a0d0be4ccf9ffecc5ec9e289ccef5d28566535fbe31 -DIST psi-0.15_de.qm 261756 SHA256 a9470932306466bd41bf08975b2b36eba0c56a8f265d998700f0e929ff345bae SHA512 3e81826215a784f1f58e633bd0fb4c0322370aa0f9c24d18ee38ff1b8a8e85e833e26349806922d1435b99433ee3296c4432a99c5fd8effc383308e168866cb0 WHIRLPOOL 77b7bbe300e450e53dff8a3175e21a8bae6f80ec0524c85599c37ed091c344cbbc63f829ea880f2b3e4c04e2cd06e9cf768ab0a674b9fb79e6c85b1a89290550 -DIST psi-0.15_fr.qm 269774 SHA256 733ec88f9bfbb30e6b21358b233e39319d3ea64223b211566ce1a0b8fe370d1c SHA512 109036baa476ad55cffd2c8109d6e99b91894eb6807ef394ea945973418af0c32641b705da172026a762e041c93b0412f61793fe6858a6c7af44bfec9c13dd1f WHIRLPOOL b51228b2ae93671aae676a0ee7519b290b6edb738f0ca8789b48a4d5b92ee8b32f99675c5f64cf5575a2d4cbbd5ea50e0001f3e06081914fc5a3d003f6f082c0 -DIST psi-0.15_it.qm 257779 SHA256 16d17cc5578f0ef6e8b2ac8dc433e7e050255014d41f2a56651f968829d2a991 SHA512 0cff1398248f7a4802f883cb912e46f27782556e675cc742af4c257910d029237849ce2cb49413f6464b7808296ea2079e5be6d5eb98b39d0dccb8e93d8d89a4 WHIRLPOOL 5e02f342f31518197477055293ae6c4e7c51931c5f985b1d46dadf7b6ef3fcb0a9af4ffe1766d7aeadab82e4f3a45b563cd88cabecf8ef49ebef3e5b56d1d3d6 -DIST psi-0.15_ja.qm 195566 SHA256 e77209493428ae06581e91435eb05ff96f442b60481dbd1a0a1d340e7ba5afc9 SHA512 e34abc4a64832cd7b4d5292a9de3d4a6e58742aa4f3fc2c0ebe60ee14e89bd8ab37b2706ea3faab6b6e7108f4bfcf7c220aae018710fa041930f23efc410ae43 WHIRLPOOL df8acef571d5686f8947e5a92ba4b4ad78cf64cae5ec205ad85c3fb926b18738ac779c30ff51dadc67853a20ffbfc827022adceef4ecdb2271955889658378fd -DIST psi-0.15_pl.qm 258292 SHA256 abb03e2ef132a343991bdc7b437fe38d24ae77a2ad39500202d645408b919f40 SHA512 8f7b5012a9d68ef50f53e4b8e3671f1cd78eb30f9a464d99225f6f5d3abeb5cea1e941255d7f8729f664d016b89cf42ceb9bd18e3a7b0d68bd4d62954abc6cb0 WHIRLPOOL 1e9c8637b6753286c159dc73d80326fc2ecaf70a5e1bf92c569aeb74192bbd63e7e0e35e69f518f11599cd5828168b2e0a6280f770f9189c811fbe8a9480237f -DIST psi-0.15_pt_BR.qm 254917 SHA256 b85d2355ebe32cd38ff091fce0444e4fc584c8a6e59c215d820dcc57fd99e3d4 SHA512 c138b1506d60bc2934dea8f06a34dc2f81c2d7cf8a5c35d95b3bd28a0a77a58f4d7e74d2bf13c55f49bd824d7c262087d14c8fcb9e341a42a966fd782d34a394 WHIRLPOOL c710deaa983f772233d39c719b6b65c929533f816b03745337ecbaff3bd69599b721d82748d81612c53e08ede1e03bb6984619823d1c0c2b0a08d2d230b52d79 -DIST psi-0.15_ru.qm 241491 SHA256 24fd952eb457ee20778f8fa2d7486521ec00571743aa1df51ad63ceb6f368527 SHA512 876695f2501661554a865873f11ad7a466ce96e4b3f896c7b3c1e049647d9968e88f9ea893d4aace8837d4387a936973b2fd36e1034b6856d45bd73088446176 WHIRLPOOL cb18bd74ed3eec6071531c468cdc972e448ad34f79f092c981a13a24f05f2100ec3660dce59033a439733eb0a35dde6cb14c2506b96c16f9ff78e1c4af3527fc -DIST psi-0.15_sl.qm 248478 SHA256 5be33716a12b297d609ec7493f9da21a23b3ab89303dc6be62a2240c0992adec SHA512 5aa316f05441524b16803a78f394b7e823c2019fb2828dc83b0cdab1b8eb0d8da2b8f3496aa34381bcea17bb7225a67582ff3f5321011bce4dae499aafdf76d6 WHIRLPOOL e4e8f74ab8538fe12f82bc0951823be94c59b91a494500e0c2f00ebc0bd95900f008664a397acf8e03565b3bfde8d6eefb7234367876372a33e49833f41fa718 -DIST psi-0.15_sv.qm 246214 SHA256 fc5822011ada2b7452c9d15baf74c90e1a58e05536e9a7cc1d81e163f44d3ca2 SHA512 b8dd5e7692512af5ec302b5fee562feb68292988160d1c9e4fac951562bd8b30bc1f67f4d39bbd437eee84b14f6aefd83a8666f0e77d02b539d65e89aee7c1aa WHIRLPOOL 6078437c20881babb731d8915952b40d415e5cc01ab7431be1930fbe887289988abc7ef9a76e09254ad8519146bd94633eba69872bee7cdb504dfc3237f1c1d0 -DIST psi-0.15_ur_PK.qm 244903 SHA256 0101370007c9ce735c50dd9bf6dfd8680c5cd562a3213b960ee507367582b3e6 SHA512 df0786f1b625ecc3144bb9be0ce51558ae45901213405997b5f8ea3c791c64328b049a48a1b88372f7b0cb5bde3b795b306ad16847d91933eedc233f8dea8bc2 WHIRLPOOL 3dc2f807d5e1dce36609854e9360d9521a7fe36d61161a2c0cf195bf58e21a4efa9b8d977a6503f41588d8befb06ca678e6e629168c93f0ab90f0ec42ffe98a5 -DIST psi-0.15_zh_TW.qm 171993 SHA256 a68897a3fe5653b4ea9651a7dc05486aadc9327fcfa96ceae84a6cfbeed4187a SHA512 69b20e18f346af244f7cfd2bc447fcb934786f7ff3d85a16ac471e275c78fb36cfb2008368d81413dbfc6ed5bd4edba3c1ab8185dae72b8aeb9bfa29fde9c871 WHIRLPOOL 2dd1e8e724007248128d69ec9389014d482d38b64df3dbcb1a17c90b94d193d793b17769d78cd36fd15d8409f1eac44eca4a2d7739d885316754df5b557a7344 DIST psi-1.2.tar.xz 2138940 SHA256 16ce1b767d40453032cd5d9ad5a9d4c6dba43989acc9a09538da3f74b7c614f5 SHA512 a486f6ee910cc17157849a68aa724608ddbeed319511646f6973a0789da192ec0fed7899024ad169c5b0e604372025dad7a58bacd223723d35ea490ec7f00b20 WHIRLPOOL 2a0f37067a085b3ce93864905367fa56584666bee6697bdae8f4eedd74cdf15f7be9eee85ba23440cb39a11e384e5ce7218a408042203fe70b398058a69b7867 DIST psi-l10n-1.2.tar.gz 2992381 SHA256 8a16c2d67c0aafbaa296fe06cd6b7de5f32683487b10245b10e8baae63b8f789 SHA512 946b86d12e76fe9a44f1adc154140a02f3d575e57b5f67c8d95472241c6d4510d1b4be81d8914d5670b15ea8ad1b836aa63fc62c3de94e0091b39e2fb234a130 WHIRLPOOL 6cd52e0dcd76f7df3137055de9d9e4518b1adfb8d6f03e9af59e0a49b01933c400d15671b252ea529543eab8f14aae34be8432c43bb28d9233f57833c0517718 diff --git a/net-im/psi/files/psi-0.14-drop-debug-cflags.patch b/net-im/psi/files/psi-0.14-drop-debug-cflags.patch deleted file mode 100644 index 227265696ae6..000000000000 --- a/net-im/psi/files/psi-0.14-drop-debug-cflags.patch +++ /dev/null @@ -1,35 +0,0 @@ -Drop -g from CFLAGS - ---- qcm/buildmodeapp.qcm 2011-10-19 14:38:55.621699641 +0200 -+++ qcm/buildmodeapp.qcm 2011-10-19 14:39:11.868700486 +0200 -@@ -130,8 +130,6 @@ - if(qc_buildmode_separate_debug_info) - { - opts += "separate_debug_info"; -- other += "*-g++*:QMAKE_CFLAGS += -g\n"; -- other += "*-g++*:QMAKE_CXXFLAGS += -g\n"; - } - - QString str = QString("CONFIG += ") + opts.join(" ") + '\n'; ---- iris/qcm/extra.qcm.old 2011-10-19 14:39:40.268701738 +0200 -+++ iris/qcm/extra.qcm 2011-10-19 14:40:01.904699887 +0200 -@@ -55,8 +55,6 @@ - if(debug_info) - { - str += QString("CONFIG += separate_debug_info\n"); -- str += "QMAKE_CFLAGS += -g\n"; -- str += "QMAKE_CXXFLAGS += -g\n"; - } - if(universal) - { ---- iris/qcm/buildmode.qcm.old 2011-10-19 14:40:23.794701147 +0200 -+++ iris/qcm/buildmode.qcm 2011-10-19 14:40:42.157701302 +0200 -@@ -186,8 +186,6 @@ - if(qc_buildmode_separate_debug_info) - { - opts += "separate_debug_info"; -- other += "QMAKE_CFLAGS += -g\n"; -- other += "QMAKE_CXXFLAGS += -g\n"; - } - - QString str = QString("CONFIG += ") + opts.join(" ") + '\n'; diff --git a/net-im/psi/files/psi-0.15-qconf-2.patch b/net-im/psi/files/psi-0.15-qconf-2.patch deleted file mode 100644 index fb62e66f726a..000000000000 --- a/net-im/psi/files/psi-0.15-qconf-2.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/qcm/recursiveprl.qcm -+++ a/qcm/recursiveprl.qcm -@@ -39,10 +39,11 @@ public: - return false; - } - -+ QFileInfo fi(qc_getenv("QC_COMMAND")); - QStringList args; - args += "-prl"; - args += "-r"; -- args += qc_getenv("QC_PROFILE"); -+ args += fi.dir().filePath(qc_getenv("QC_PROFILE")); - if(conf->doCommand(conf->qmake_path, args) != 0) - { - success = false; -@@ -91,9 +92,9 @@ public: - if(!conf->DEFINES.isEmpty()) - str += "DEFINES += " + conf->DEFINES + '\n'; - if(!conf->INCLUDEPATH.isEmpty()) -- str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n'; -+ str += "INCLUDEPATH += " + conf->escapedIncludes() + '\n'; - if(!conf->LIBS.isEmpty()) -- str += "LIBS += " + conf->LIBS + '\n'; -+ str += "LIBS += " + conf->escapedLibs() + '\n'; - if(!conf->extra.isEmpty()) - str += conf->extra; - str += '\n'; ---- a/qcm/zlib.qcm -+++ a/qcm/zlib.qcm -@@ -21,6 +21,8 @@ public: - QStringList incs; - QString version, libs, other; - QString s; -+ -+ - - if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) { - -@@ -33,21 +35,37 @@ public: - if(!conf->findHeader("zlib.h", QStringList(), &s)) - return false; - } -- incs.append(s.replace("\\\", "\\\\\\\")); - -- s = conf->getenv("QC_WITH_ZLIB_LIB"); -- if(!s.isEmpty()) { -- if(!conf->checkLibrary(s, "z")) -- return false; -- } -- else { -- if(!conf->findLibrary("z", &s)) -- return false; -+ QStringList libNames = QStringList() << "z"; -+ QString libName; -+#ifdef Q_OS_WIN -+ libNames << (qc_buildmode_debug? "zlibd" : "zlib"); -+#endif -+ for (;;) { -+ s = conf->getenv("QC_WITH_ZLIB_LIB"); -+ if(!s.isEmpty()) { -+ foreach (const QString l, libNames) -+ if(conf->checkLibrary(s, l)) { -+ libName = l; -+ break; -+ } -+ } else { -+ foreach (const QString l, libNames) -+ if(conf->findLibrary(l, &s)) { -+ libName = l; -+ break; -+ } -+ } -+ -+ if(!libName.isEmpty()) -+ break; -+ -+ return false; - } - if (!s.isEmpty()) { -- libs = QString("-L%1 -lz").arg(s.replace("\\\", "\\\\\\\")); -+ libs = QString("-L%1 -l%2").arg(s, libName); - } else { -- libs = s.isEmpty()? "-lz" : QString("-L%1 -lz").arg(s); -+ libs = s.isEmpty()? QString("-l")+libName : QString("-L%1 -l%2").arg(s, libName); - } - } - diff --git a/net-im/psi/psi-0.15.ebuild b/net-im/psi/psi-0.15.ebuild deleted file mode 100644 index 7f771ecfb559..000000000000 --- a/net-im/psi/psi-0.15.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PLOCALES="be cs de fr it ja pl pt_BR ru sl sv ur_PK zh_TW" -inherit eutils l10n multilib gnome2-utils qt4-r2 readme.gentoo - -DESCRIPTION="Qt4 Jabber client, with Licq-like interface" -HOMEPAGE="http://psi-im.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -for LNG in ${PLOCALES}; do - SRC_URI="${SRC_URI} - linguas_${LNG}? ( http://psi-im.org/download/lang/${PN}_${LNG}.qm -> ${P}_${LNG}.qm )" -done - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd" -IUSE="crypt dbus debug doc jingle spell ssl xscreensaver whiteboarding" -RESTRICT="test" - -RDEPEND=" - app-arch/unzip - >=app-crypt/qca-2.0.2:2[qt4(+)] - dev-qt/qtcore:4 - dev-qt/qtgui:4 - >=sys-libs/zlib-1.2.5.1-r2[minizip] - x11-libs/libX11 - dbus? ( dev-qt/qtdbus:4 ) - spell? ( >=app-text/enchant-1.3.0 ) - whiteboarding? ( dev-qt/qtsvg:4 ) - xscreensaver? ( x11-libs/libXScrnSaver ) -" -DEPEND="${RDEPEND} - sys-devel/qconf[qt4(+)] - doc? ( app-doc/doxygen ) -" -PDEPEND=" - crypt? ( app-crypt/qca:2[gpg] ) - jingle? ( - net-im/psimedia - app-crypt/qca:2[ssl] - ) - ssl? ( app-crypt/qca:2[ssl] ) -" - -DOC_CONTENTS='Psi+ support(USE="extras") was removed from ebuild since 0.15' -FORCE_PRINT_ELOG=1 - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.14-drop-debug-cflags.patch" - epatch "${FILESDIR}/${P}-qconf-2.patch" - epatch_user - - qconf || die "Failed to create ./configure." -} - -src_configure() { - # unable to use econf because of non-standard configure script - # disable growl as it is a MacOS X extension only - local confcmd="./configure - --prefix=/usr - --qtdir=/usr - --disable-growl - --no-separate-debug-info - $(use dbus || echo '--disable-qdbus') - $(use debug && echo '--debug') - $(use spell || echo '--disable-aspell') - $(use spell || echo '--disable-enchant') - $(use xscreensaver || echo '--disable-xss') - $(use whiteboarding && echo '--enable-whiteboarding')" - - echo ${confcmd} - ${confcmd} || die "configure failed" - # Makefile is not always created... - [[ ! -f Makefile ]] && die "configure failed" -} - -src_compile() { - eqmake4 - - emake - - if use doc; then - cd doc || die - mkdir -p api || die # 259632 - emake api_public - fi -} - -src_install() { - install_locale() { - newins "${DISTDIR}/${P}_${1}.qm" "${PN}_${1}.qm" - } - - emake INSTALL_ROOT="${D}" install - rm "${D}"/usr/share/psi/{COPYING,README} || die - - readme.gentoo_create_doc - - # this way the docs will be installed in the standard gentoo dir - newdoc iconsets/roster/README README.roster - newdoc iconsets/system/README README.system - newdoc certs/README README.certs - dodoc README - - if use doc; then - cd doc || die - dohtml -r api - fi - - # install translations - insinto /usr/share/${PN} - l10n_for_each_locale_do install_locale -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - readme.gentoo_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- cgit v1.2.3-65-gdbad