From 9ab6e5a538ef02d2df93756202a68dc2cefceb13 Mon Sep 17 00:00:00 2001 From: Timo Gurr Date: Thu, 15 Sep 2011 21:42:38 +0000 Subject: Revbump fixing bug #382879 and bug #383003, thanks to Lars Wendler. Remove old. Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- media-sound/murmur/ChangeLog | 10 +- media-sound/murmur/Manifest | 18 +--- .../files/murmur-1.2.3-ice-3.4.2-compat.patch | 11 ++ media-sound/murmur/files/murmur.initd | 4 +- media-sound/murmur/murmur-1.2.2.ebuild | 107 ------------------- media-sound/murmur/murmur-1.2.3-r1.ebuild | 113 +++++++++++++++++++++ 6 files changed, 139 insertions(+), 124 deletions(-) create mode 100644 media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch delete mode 100644 media-sound/murmur/murmur-1.2.2.ebuild create mode 100644 media-sound/murmur/murmur-1.2.3-r1.ebuild (limited to 'media-sound/murmur') diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog index 1c43e065f339..d6024a4bc4ab 100644 --- a/media-sound/murmur/ChangeLog +++ b/media-sound/murmur/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-sound/murmur # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.25 2011/06/14 20:09:31 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.26 2011/09/15 21:42:38 tgurr Exp $ + +*murmur-1.2.3-r1 (15 Sep 2011) + + 15 Sep 2011; Timo Gurr -murmur-1.2.2.ebuild, + +murmur-1.2.3-r1.ebuild, +files/murmur-1.2.3-ice-3.4.2-compat.patch, + files/murmur.initd: + Revbump fixing bug #382879 and bug #383003, thanks to Lars Wendler. Remove + old. 14 Jun 2011; Markus Meier murmur-1.2.3.ebuild: amd64/x86 stable, bug #370245 diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest index 11f2369dadd3..4620ad8a6765 100644 --- a/media-sound/murmur/Manifest +++ b/media-sound/murmur/Manifest @@ -1,21 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX murmur-1.2.3-ice-3.4.2-compat.patch 611 RMD160 ad5a585f45cd5c6306d6e82e545e799e53cabe9a SHA1 2deb14fa2d9431fe59caad87bc94d06b83bafd34 SHA256 72cc624b3fb0aa62c38daeed45636c27856831a147284e79aa7a61c88f8f1bf6 AUX murmur.confd 244 RMD160 c15d1f5ea8ac2e7673f4a99853b8ffc04722ef6f SHA1 5333693bd28ff70c13dc48638d69d503cb930564 SHA256 f1b452f3d67884a74a08afcaebb2e7ba9c88e4213d8c24f598479bfde3bf7f2f -AUX murmur.initd 679 RMD160 8f9a9eb252201fa9714137d9578edf680c8be6c8 SHA1 5a5239f5ea22affbbdd9c721a457d9574f3b2fac SHA256 47c1085285a16bf83043c5f129db05e3fbf4f5ff30ba19eb683ec7c88113913e +AUX murmur.initd 681 RMD160 70a62fc0011fb8334966d0ab6705aac0062cef19 SHA1 70fb0ec14151252736452beade83e2fcc6e55cd6 SHA256 36efaa00cc532a1384ec52f0aef98fb2ef26fc757e8885ed69a74a9f78c578a5 AUX murmur.logrotate 127 RMD160 1053af850dad13fa9d1232dc176752889ed9f8bd SHA1 22e7b4cbf222cf558267bf3ff0d4dae805f737c6 SHA256 203d1f0c159d1c8ed06aac13c7a2cf20d67f36cb4ad043f54d90bef3b9de62c6 DIST mumble-1.1.8.tar.gz 1241365 RMD160 d2d05993b38749f30ed67b8b92a22ef236dc7cf1 SHA1 83b5ef771b6801953290ee184f1590686e831b8c SHA256 4cef76457e3178f9d854327f4a02c3521b19ddf64c03947b3ba182f871a81856 -DIST mumble-1.2.2.tar.gz 2920587 RMD160 501aa1c4c170fb5aad2841cdfe3421376e62a07b SHA1 b2a7fd50e70147b3ea2361cbc5a577b0e1ae45ea SHA256 2c564e3d5b7481129482f2365375a2dc77e134c0c00012073cfdfbeadaa49be8 DIST mumble-1.2.3.tar.gz 3448053 RMD160 c02e1c42e6996e7b6052772089febd22be67582d SHA1 420e245ef978d7e51ca3ed97922acf13f5ef982d SHA256 05895122ae4abec3fb62ef24ed9d167ffd768e7080ed179c8bf3afca96d18a5c EBUILD murmur-1.1.8.ebuild 2845 RMD160 c533fb32d57915ccfa3721cfb530d7d9fa85c6cf SHA1 c1a1a937eeda981420235ac1768b6921bd56e652 SHA256 07f16db719ed5f33a4fdf601235797cd107cd77def524c781ecfbbc3ef6cd05a -EBUILD murmur-1.2.2.ebuild 3167 RMD160 97225e1215337db09e3b37727960c983cbd8036e SHA1 ba32b596e4aded07e929bf8b1f1905ed8436754b SHA256 e4a8fd5ad36da3fe8085496fc1b59d96fa44c5c04636c5cda7ce2dd1681e6bd7 +EBUILD murmur-1.2.3-r1.ebuild 2815 RMD160 8efb946fa24f19a469935dde15c675bc8a20661e SHA1 c6ae33feb23d882f8fd3db29624dd90f215f8ec8 SHA256 97143763858ca94e7b236851e0b2477ee4b35cf1102a4eb64ce46e516efc90dd EBUILD murmur-1.2.3.ebuild 3297 RMD160 a175f4ef7fc21b451015c0c6db5fe66ad28d1caa SHA1 6ebe724890666a2eba75bfac733a6718f949c2c4 SHA256 4f942bfd16e98cf0b926f6321b24d779fd749866312adfef84892fe4f6a38e73 -MISC ChangeLog 4501 RMD160 956a590fbf86e96d62a5cc65bf1de3f753c8f99b SHA1 fa405aee353c0b76e8e2bc9aa2829dd43341ea9e SHA256 f41bec5df271499799952e0664d365e36146548df1f2afb50aaa82ec70fc8a70 +MISC ChangeLog 4776 RMD160 1719782ca24f1a6d8c61c3ab4f7106a24300e773 SHA1 78f049642bd3f62eda1e002f88eaa77d3cd4cee1 SHA256 9be8a369ee2a665320cb98a89e7fc36331c45e5c2facda64872e55d7ec809e97 MISC metadata.xml 480 RMD160 6e9216bf763dbbc619a699b787a4ae20c0c8f500 SHA1 bd2ab47ea3dce184e6a560a8a77034ecc2b85372 SHA256 4fa0864013dcdcda9b1e16a8f97af9e0af12b4ccefd2d163954f241391f76c2c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk33wDMACgkQkKaRLQcq0GLXXgCggrPfmcappmYgjDuB/51HVLkR -z+YAniJixMRu+vFtKlYtPrq95f8CUlZo -=La4v ------END PGP SIGNATURE----- diff --git a/media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch b/media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch new file mode 100644 index 000000000000..430ae74d9c1b --- /dev/null +++ b/media-sound/murmur/files/murmur-1.2.3-ice-3.4.2-compat.patch @@ -0,0 +1,11 @@ +--- mumble-1.2.3/src/murmur/murmur.pro ++++ mumble-1.2.3/src/murmur/murmur.pro +@@ -69,7 +69,7 @@ + win32 { + slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" Murmur.ice + } else { +- slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ Murmur.ice ++ slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ Murmur.ice + } + + slice.depends = Murmur.ice diff --git a/media-sound/murmur/files/murmur.initd b/media-sound/murmur/files/murmur.initd index 38054eac3f02..f7c2ddd6480f 100644 --- a/media-sound/murmur/files/murmur.initd +++ b/media-sound/murmur/files/murmur.initd @@ -1,6 +1,6 @@ #!/sbin/runscript -opts="reload" +extra_started_commands="reload" depend() { need localmount net @@ -29,7 +29,7 @@ reload() { return 1 fi ebegin "Reloading Murmur" - start-stop-daemon --stop --oknodo --signal HUP --pidfile "${MURMUR_PID}" \ + start-stop-daemon --signal HUP --pidfile "${MURMUR_PID}" \ --exec /usr/bin/murmurd eend $? } diff --git a/media-sound/murmur/murmur-1.2.2.ebuild b/media-sound/murmur/murmur-1.2.2.ebuild deleted file mode 100644 index f945249282ab..000000000000 --- a/media-sound/murmur/murmur-1.2.2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.2.ebuild,v 1.2 2010/06/08 08:30:08 dev-zero Exp $ - -EAPI="2" - -inherit eutils qt4 - -MY_P="${PN/murmur/mumble}-${PV/_/~}" - -DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software." -HOMEPAGE="http://mumble.sourceforge.net/" -SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+dbus debug +ice pch zeroconf" - -RDEPEND="dev-libs/openssl - >=dev-libs/protobuf-2.2.0 - >=sys-libs/libcap-2.15 - x11-libs/qt-core:4[ssl] - || ( x11-libs/qt-sql:4[sqlite] x11-libs/qt-sql:4[mysql] ) - x11-libs/qt-xmlpatterns:4 - dbus? ( x11-libs/qt-dbus:4 ) - ice? ( dev-libs/Ice ) - zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )" - -DEPEND="${RDEPEND} - >=dev-libs/boost-1.36.0-r1 - dev-util/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup murmur - enewuser murmur -1 -1 /var/lib/murmur murmur -} - -src_prepare() { - sed -i \ - -e 's:mumble-server:murmur:g' \ - "${S}"/scripts/murmur.conf \ - "${S}"/scripts/murmur.ini.system \ - || die "sed failed." -} - -src_configure() { - local conf_add - use dbus || conf_add="${conf_add} no-dbus" - use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release" - use ice || conf_add="${conf_add} no-ice" - use pch || conf_add="${conf_add} no-pch" - use zeroconf || conf_add="${conf_add} no-bonjour" - - eqmake4 main.pro -recursive \ - CONFIG+="${conf_add} \ - no-client" \ - || die "eqmake4 failed." -} - -src_install() { - dodoc README CHANGES || die "Installing docs failed." - - docinto scripts - dodoc scripts/*.php scripts/*.pl || die "Installing docs failed." - - local dir - if use debug; then - dir=debug - else - dir=release - fi - - dobin "${dir}"/murmurd || die "Installing murmurd binary failed." - - insinto /etc/murmur/ - newins scripts/murmur.ini.system murmur.ini || die "Installing murmur.ini configuration file failed." - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/murmur.logrotate murmur || die "Installing murmur logrotate file failed." - - insinto /etc/dbus-1/system.d/ - doins scripts/murmur.conf || die "Installing murmur.conf dbus configuration file failed." - - newinitd "${FILESDIR}"/murmur.initd murmur || die "Installing murmur init.d file failed." - newconfd "${FILESDIR}"/murmur.confd murmur || die "Installing murmur conf.d file failed." - - keepdir /var/lib/murmur /var/run/murmur /var/log/murmur - fowners -R murmur /var/lib/murmur /var/run/murmur /var/log/murmur || die "fowners failed." - fperms 750 /var/lib/murmur /var/run/murmur /var/log/murmur || die "fperms failed." - - doman man/murmurd.1 || die "Installing murmur manpage failed." -} - -pkg_postinst() { - echo - elog "Useful scripts are located in /usr/share/doc/${PF}/scripts." - elog "Please execute:" - elog "murmurd -ini /etc/murmur/murmur.ini -supw " - elog "chown murmur:murmur /var/lib/murmur/murmur.sqlite" - elog "to set the build-in 'SuperUser' password before starting murmur." - elog "Please restart dbus before starting murmur, or else dbus" - elog "registration will fail." - echo -} diff --git a/media-sound/murmur/murmur-1.2.3-r1.ebuild b/media-sound/murmur/murmur-1.2.3-r1.ebuild new file mode 100644 index 000000000000..61cbb00fe9d0 --- /dev/null +++ b/media-sound/murmur/murmur-1.2.3-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.3-r1.ebuild,v 1.1 2011/09/15 21:42:38 tgurr Exp $ + +EAPI="4" + +inherit eutils qt4-r2 + +MY_P="${PN/murmur/mumble}-${PV/_/~}" + +DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" +HOMEPAGE="http://mumble.sourceforge.net/" +SRC_URI="mirror://sourceforge/mumble/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+dbus debug +ice pch zeroconf" + +RDEPEND=">=dev-libs/openssl-1.0.0b + >=dev-libs/protobuf-2.2.0 + sys-apps/lsb-release + >=sys-libs/libcap-2.15 + x11-libs/qt-core:4[ssl] + || ( x11-libs/qt-sql:4[sqlite] x11-libs/qt-sql:4[mysql] ) + x11-libs/qt-xmlpatterns:4 + dbus? ( x11-libs/qt-dbus:4 ) + ice? ( dev-libs/Ice ) + zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )" + +DEPEND="${RDEPEND} + >=dev-libs/boost-1.41.0 + dev-util/pkgconfig" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/${PN}-1.2.3-ice-3.4.2-compat.patch" ) + +pkg_setup() { + enewgroup murmur + enewuser murmur -1 -1 /var/lib/murmur murmur +} + +src_prepare() { + qt4-r2_src_prepare + + sed -i -e 's:mumble-server:murmur:g' \ + "${S}"/scripts/murmur.{conf,ini.system} || die +} + +src_configure() { + local conf_add + + use dbus || conf_add="${conf_add} no-dbus" + use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release" + use ice || conf_add="${conf_add} no-ice" + use pch || conf_add="${conf_add} no-pch" + use zeroconf || conf_add="${conf_add} no-bonjour" + + eqmake4 main.pro -recursive \ + CONFIG+="${conf_add} no-client" +} + +src_compile() { + # parallel make workaround, upstream bug #3190498 + emake -j1 +} + +src_install() { + dodoc README CHANGES + + docinto scripts + dodoc scripts/*.php scripts/*.pl + + local dir + if use debug; then + dir=debug + else + dir=release + fi + + dobin "${dir}"/murmurd + + insinto /etc/murmur/ + newins scripts/murmur.ini.system murmur.ini + + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/murmur.logrotate murmur + + insinto /etc/dbus-1/system.d/ + doins scripts/murmur.conf + + newinitd "${FILESDIR}"/murmur.initd murmur + newconfd "${FILESDIR}"/murmur.confd murmur + + keepdir /var/lib/murmur /var/run/murmur /var/log/murmur + fowners -R murmur /var/lib/murmur /var/run/murmur /var/log/murmur + fperms 750 /var/lib/murmur /var/run/murmur /var/log/murmur + + doman man/murmurd.1 +} + +pkg_postinst() { + echo + elog "Useful scripts are located in /usr/share/doc/${PF}/scripts." + elog "Please execute:" + elog "murmurd -ini /etc/murmur/murmur.ini -supw " + elog "chown murmur:murmur /var/lib/murmur/murmur.sqlite" + elog "to set the build-in 'SuperUser' password before starting murmur." + elog "Please restart dbus before starting murmur, or else dbus" + elog "registration will fail." + echo +} -- cgit v1.2.3-65-gdbad