From 769c08c9cc94c65fd14d5628e3169bd177f0840f Mon Sep 17 00:00:00 2001 From: Antti Jarvinen Date: Wed, 4 May 2016 23:01:29 +0300 Subject: [PATCH 1/3] net-p2p/classified-ads: v0.10 version bump. Package-Manager: portage-2.2.26 --- net-p2p/classified-ads/Manifest | 2 + .../classified-ads/classified-ads-0.10.ebuild | 80 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 net-p2p/classified-ads/classified-ads-0.10.ebuild diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest index 355c7689887c1..b87d10b734ca4 100644 --- a/net-p2p/classified-ads/Manifest +++ b/net-p2p/classified-ads/Manifest @@ -2,7 +2,9 @@ DIST classified-ads-0.07.tar.gz 2194177 SHA256 882874da2d1610d64c952969222b9295b DIST classified-ads-0.07_p20150728.tar.gz 2197413 SHA256 e8d488b6c44b198bf1150c7a33ae698887cfb345cb4473d91a5949abeb846d95 SHA512 1cb42252ab695e90212d05144255a66b0d8dc63d8d010b5781e470a4c5e9cdf9c4dce1b9e44cba83d5fb2fef99e3d46fd5cc1b9880db69c9c163475b7e4349fc WHIRLPOOL 458d3947f00709c633d652b753b7801496479f610da0d249e8e2f5f7ddecb341fb885184c027b453aa2f9db7998a74fcbd60bbb9d0bb5765b7b7e45bcdcfc2c0 DIST classified-ads-0.09.tar.gz 2288561 SHA256 c6c0809c269e7596386b612f0a43c705801bad71c64a23a81f763656b22db125 SHA512 3639854cb797830f71261097ba315426be74f0dbcb5190522d50f4507d488d309c0793d1cad5bbc29bc43bd06de16392afc82172cefa766458764b4ac5b90357 WHIRLPOOL 7149c2772ca61a5067722f6aa5066e4dee3aec758b1998633d129cd4704723e6c633522a241cc4332dca94cac0bb59ada9a5472c750d335a764e1ff2f09c9d8f DIST classified-ads-0.09_p20151220.tar.gz 2288916 SHA256 4703c8f0183248376c9a0ce220115f44940c8c82efb93082bf313f42c73e1a7f SHA512 2a167e0bf8fe74014ae797cebb6577e481d75afbfd9a4a49587e857777eadd71285f0431ca22fa0a83efde2192d792a4517fbdbfe37cbb2ae1e6ab19f6e89e1e WHIRLPOOL ee12913ae813631e711d33cc62deedc50a4e173dcb3d793757f042eae04ec63c6062e9543a42aac50164a2e68fac59030f3ac43c232fc787b9b2e7020c4c9c84 +DIST classified-ads-0.10.tar.gz 2527827 SHA256 9b2f653d239e78c41505f6ee44e41cf4e176eb8aa5f4e26549e32afadf0045d7 SHA512 54c94c799ee99b9d362cefb7587e100fac807dd2583ddad2e7e9f046823fe4f8a206cbde8b839658c0e78ad50e056faa30cda7d45de9aa518b9483e3e36910a4 WHIRLPOOL b6ba9036adf8f104a58488b7eba45349cc12f0c2fa80fa370873640b0b3f2e95895136efbda6471b7188a8e5ffe9575af2fae2b676cc0a29f48860ba48ac47aa DIST classified-ads-graphics-0.07.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad DIST classified-ads-graphics-0.07_p20150728.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad DIST classified-ads-graphics-0.09.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad DIST classified-ads-graphics-0.09_p20151220.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad +DIST classified-ads-graphics-0.10.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad diff --git a/net-p2p/classified-ads/classified-ads-0.10.ebuild b/net-p2p/classified-ads/classified-ads-0.10.ebuild new file mode 100644 index 0000000000000..31c26f639c9da --- /dev/null +++ b/net-p2p/classified-ads/classified-ads-0.10.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +PLOCALES="en fi sv da uk" +PLOCALE_BACKUP="en" +inherit qmake-utils virtualx vcs-snapshot + +COMMIT_ID="cd0652c52f86f6284b793f26e5362bc8fb8a7118" +DESCRIPTION="Program for displaying classified advertisement items" +HOMEPAGE="http://katiska.org/classified-ads/" +SRC_URI="https://github.com/operatornormal/classified-ads/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz \ + https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \ + -> classified-ads-graphics-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="debug doc test" + +RDEPEND="dev-libs/openssl:0 + >=net-libs/libnatpmp-20130911 + <=net-libs/libnatpmp-20140401-r1 + >=net-libs/miniupnpc-1.8 + sys-apps/file + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtwidgets:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtmultimedia:5[widgets] + dev-qt/qt-mobility[multimedia] + dev-qt/qtprintsupport:5 + media-libs/opus" + +DEPEND="${RDEPEND} + sys-devel/gettext + sys-devel/gdb:0 + doc? ( app-doc/doxygen[dot] ) + test? ( dev-libs/libgcrypt:0 + dev-qt/qttest:5 + ${VIRTUALX_DEPEND} )" + +src_prepare() { + # preprocessed graphics are unpacked into wrong directory + # so lets move them into correct location: + mv ../classified-ads-graphics-${PV}/* ui/ || die + # possible patches + eapply_user + # then just run qmake + eqmake5 +} + +src_compile() { + emake + if use doc; then + cd doc || die + doxygen || die + fi +} + +src_test() { + virtx test_suite +} + +src_install() { + emake install INSTALL_ROOT="${D}" DESTDIR="${D}" + use doc && dodoc -r doc/doxygen.generated/html/ +} + +# virtualx requires a command that returns number, and does not just die: +test_suite() { + cd test || return -1 + eqmake5 || return -2 + emake + ./testca + return $? +} From 87e478dc925b054c19541e6009d3dfb018b8a05a Mon Sep 17 00:00:00 2001 From: Antti Jarvinen Date: Tue, 10 May 2016 22:30:21 +0300 Subject: [PATCH 2/3] net-p2p/classified-ads: v0.10 version bump streamlining due to review comments: added "inherit l10n", added dependency to virtual/libintl, removed dependency to $VIRTUALX_DEPEND, changed again way how test suite is configured and run. Package-Manager: portage-2.2.26 --- .../classified-ads/classified-ads-0.10.ebuild | 35 ++++++++++--------- net-p2p/classified-ads/metadata.xml | 26 ++++++++------ 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/net-p2p/classified-ads/classified-ads-0.10.ebuild b/net-p2p/classified-ads/classified-ads-0.10.ebuild index 31c26f639c9da..b864b96bed698 100644 --- a/net-p2p/classified-ads/classified-ads-0.10.ebuild +++ b/net-p2p/classified-ads/classified-ads-0.10.ebuild @@ -5,7 +5,7 @@ EAPI=6 PLOCALES="en fi sv da uk" PLOCALE_BACKUP="en" -inherit qmake-utils virtualx vcs-snapshot +inherit qmake-utils virtualx vcs-snapshot l10n COMMIT_ID="cd0652c52f86f6284b793f26e5362bc8fb8a7118" DESCRIPTION="Program for displaying classified advertisement items" @@ -33,15 +33,14 @@ RDEPEND="dev-libs/openssl:0 dev-qt/qtmultimedia:5[widgets] dev-qt/qt-mobility[multimedia] dev-qt/qtprintsupport:5 - media-libs/opus" + media-libs/opus + virtual/libintl" DEPEND="${RDEPEND} - sys-devel/gettext - sys-devel/gdb:0 doc? ( app-doc/doxygen[dot] ) test? ( dev-libs/libgcrypt:0 dev-qt/qttest:5 - ${VIRTUALX_DEPEND} )" + sys-devel/gdb:0 )" src_prepare() { # preprocessed graphics are unpacked into wrong directory @@ -49,32 +48,34 @@ src_prepare() { mv ../classified-ads-graphics-${PV}/* ui/ || die # possible patches eapply_user - # then just run qmake +} + +src_configure() { eqmake5 + if use test; then + cd test || die + eqmake5 + fi } src_compile() { emake if use doc; then - cd doc || die + cd "${S}"/doc || die doxygen || die fi + if use test; then + cd "${S}"/test || die + emake + fi } src_test() { - virtx test_suite + # testca will return 0 if all unit tests pass + virtx ./test/testca } src_install() { emake install INSTALL_ROOT="${D}" DESTDIR="${D}" use doc && dodoc -r doc/doxygen.generated/html/ } - -# virtualx requires a command that returns number, and does not just die: -test_suite() { - cd test || return -1 - eqmake5 || return -2 - emake - ./testca - return $? -} diff --git a/net-p2p/classified-ads/metadata.xml b/net-p2p/classified-ads/metadata.xml index bc9defd64d695..c2d79851cfb00 100644 --- a/net-p2p/classified-ads/metadata.xml +++ b/net-p2p/classified-ads/metadata.xml @@ -1,18 +1,10 @@ - - idella4@gentoo.org - - + antti.jarvinen@katiska.org Antti Järvinen - proxy maintainer - - proxy-maint@gentoo.org - Proxy Maintainers - Classified ads is an attempt to re-produce parts of the functionality that went away when Usenet news ceased to exist. This attempt tries to @@ -28,11 +20,25 @@ * (Small-sized) binary attachments to posts. * Providing basic data of operators - data that operator may enter himself, or leave blank. - * Basic searching of content based on words. + * Basic searching of content based on words. + * Voice negotiations between operators + + If used by saying "export FEATURES=test" before + emerge will cause test suite to be compile and run during + emerge and if test suite fails, install will be not node. + + If used, doxygen will be run on sources and + resulting HTML documentation will be installed together + with binaries. Does not include much end-user documentation + but more documentation inteded for other developers. + + + antti.jarvinen@katiska.org + Antti Järvinen https://github.com/operatornormal/classified-ads/commits/master https://github.com/operatornormal/classified-ads/issues From 1c944fc0621c30c8efe9262cb62259e94db3238e Mon Sep 17 00:00:00 2001 From: Antti Jarvinen Date: Wed, 11 May 2016 20:41:09 +0300 Subject: [PATCH 3/3] net-p2p/classified-ads: v0.10 version bump Based on comments at pull request - used pushd/popd instead of cd in ebuild - removed IUSE debug that was not referenced anywhere Package-Manager: portage-2.2.26 --- net-p2p/classified-ads/classified-ads-0.10.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net-p2p/classified-ads/classified-ads-0.10.ebuild b/net-p2p/classified-ads/classified-ads-0.10.ebuild index b864b96bed698..1a490717b624a 100644 --- a/net-p2p/classified-ads/classified-ads-0.10.ebuild +++ b/net-p2p/classified-ads/classified-ads-0.10.ebuild @@ -18,7 +18,7 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug doc test" +IUSE="doc test" RDEPEND="dev-libs/openssl:0 >=net-libs/libnatpmp-20130911 @@ -61,12 +61,14 @@ src_configure() { src_compile() { emake if use doc; then - cd "${S}"/doc || die + pushd doc || die doxygen || die + popd >> /dev/null || die fi if use test; then - cd "${S}"/test || die + pushd test || die emake + popd >> /dev/null || die fi }