From 75d390a9a92282e869342400dfd06b9620d8dfe1 Mon Sep 17 00:00:00 2001 From: Jose Quinteiro Date: Sun, 13 Feb 2011 18:34:04 -0800 Subject: Incorporate Jac Goudsmit's latest changes, recreate manifests --- dev-vcs/perforce-cli/Manifest | 6 +-- .../perforce-cli/perforce-cli-2010.1.251161.ebuild | 36 -------------- .../perforce-cli/perforce-cli-2010.1.265509.ebuild | 36 ++++++++++++++ dev-vcs/perforce-gui/Manifest | 8 +-- dev-vcs/perforce-gui/files/50-perforce-gui | 14 ++++++ dev-vcs/perforce-gui/files/p4v.desktop | 13 +++++ .../perforce-gui/perforce-gui-2010.1.251161.ebuild | 34 ------------- .../perforce-gui/perforce-gui-2010.1.276058.ebuild | 42 ++++++++++++++++ dev-vcs/perforce-server/Manifest | 8 +-- .../perforce-server-2010.1.251161.ebuild | 58 ---------------------- .../perforce-server-2010.1.273938.ebuild | 58 ++++++++++++++++++++++ 11 files changed, 175 insertions(+), 138 deletions(-) delete mode 100644 dev-vcs/perforce-cli/perforce-cli-2010.1.251161.ebuild create mode 100644 dev-vcs/perforce-cli/perforce-cli-2010.1.265509.ebuild create mode 100644 dev-vcs/perforce-gui/files/50-perforce-gui create mode 100644 dev-vcs/perforce-gui/files/p4v.desktop delete mode 100644 dev-vcs/perforce-gui/perforce-gui-2010.1.251161.ebuild create mode 100644 dev-vcs/perforce-gui/perforce-gui-2010.1.276058.ebuild delete mode 100644 dev-vcs/perforce-server/perforce-server-2010.1.251161.ebuild create mode 100644 dev-vcs/perforce-server/perforce-server-2010.1.273938.ebuild diff --git a/dev-vcs/perforce-cli/Manifest b/dev-vcs/perforce-cli/Manifest index 93ec175..e81a266 100644 --- a/dev-vcs/perforce-cli/Manifest +++ b/dev-vcs/perforce-cli/Manifest @@ -1,3 +1,3 @@ -DIST perforce-cli-2010.1.251161-amd64 808360 RMD160 d5f6de001403fc61663d71ae802eb284aff0dae9 SHA1 82f61c7320a8fb760761d31a9951d0f5bccd6d86 SHA256 59ed7e034fe117d54e8fec5a286ad89baceb06b1899d19f1552e75f19debfc93 -DIST perforce-cli-2010.1.251161-x86 755848 RMD160 c5379b51a36dba4e1cd576494c748271e4400cab SHA1 272c9d92a850a34c4a7c343d84781fd8a141c482 SHA256 92d6250ba409ff202d91016376dca526261529933c66cc9336e0e03d729ed551 -EBUILD perforce-cli-2010.1.251161.ebuild 822 RMD160 b884b4faf1c8ded086629e0cd0ce2dadd63a52c9 SHA1 6a02e4019179c43dd1fb5050adc60b16f27db194 SHA256 f1474a90b6e39bc85164427e98879601883d47f5a259b65e2443942390666ebb +DIST perforce-cli-2010.1.265509-amd64 808360 RMD160 d5f6de001403fc61663d71ae802eb284aff0dae9 SHA1 82f61c7320a8fb760761d31a9951d0f5bccd6d86 SHA256 59ed7e034fe117d54e8fec5a286ad89baceb06b1899d19f1552e75f19debfc93 +DIST perforce-cli-2010.1.265509-x86 755848 RMD160 c5379b51a36dba4e1cd576494c748271e4400cab SHA1 272c9d92a850a34c4a7c343d84781fd8a141c482 SHA256 92d6250ba409ff202d91016376dca526261529933c66cc9336e0e03d729ed551 +EBUILD perforce-cli-2010.1.265509.ebuild 799 RMD160 bfe2c3ab0f10f97bb1c2e9774c3402f623dbd943 SHA1 4648bb9d02c07d309379812d948bea85e6f82ab3 SHA256 d178b72c40d75798ebff7a86078d83b720a2992654c1623cff8b250ef889e6cb diff --git a/dev-vcs/perforce-cli/perforce-cli-2010.1.251161.ebuild b/dev-vcs/perforce-cli/perforce-cli-2010.1.251161.ebuild deleted file mode 100644 index a4fe959..0000000 --- a/dev-vcs/perforce-cli/perforce-cli-2010.1.251161.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header$ - -inherit versionator - -EAPI=2 - -REL=$(get_version_component_range 1-2) -SHORTREL=${REL/#20/} - -DESCRIPTION="Command line tool for Perforce version control system" -HOMEPAGE="http://www.perforce.com/" -SRC_URI="x86? ( ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86/p4 \ - -> ${PF}-x86 ) - amd64? ( ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86_64/p4 \ - -> ${PF}-amd64 )" - -LICENSE="perforce" -SLOT="0" -KEYWORDS="-* ~x86 ~amd64" -IUSE="" -RESTRICT="mirror strip" - -S=${WORKDIR} - -src_unpack() { - # we have to copy all of the files from $DISTDIR, otherwise we get - # sandbox violations when trying to install - - cp ${DISTDIR}/${A} p4 -} - -src_install() { - dobin p4 || die -} diff --git a/dev-vcs/perforce-cli/perforce-cli-2010.1.265509.ebuild b/dev-vcs/perforce-cli/perforce-cli-2010.1.265509.ebuild new file mode 100644 index 0000000..a4fe959 --- /dev/null +++ b/dev-vcs/perforce-cli/perforce-cli-2010.1.265509.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +inherit versionator + +EAPI=2 + +REL=$(get_version_component_range 1-2) +SHORTREL=${REL/#20/} + +DESCRIPTION="Command line tool for Perforce version control system" +HOMEPAGE="http://www.perforce.com/" +SRC_URI="x86? ( ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86/p4 \ + -> ${PF}-x86 ) + amd64? ( ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86_64/p4 \ + -> ${PF}-amd64 )" + +LICENSE="perforce" +SLOT="0" +KEYWORDS="-* ~x86 ~amd64" +IUSE="" +RESTRICT="mirror strip" + +S=${WORKDIR} + +src_unpack() { + # we have to copy all of the files from $DISTDIR, otherwise we get + # sandbox violations when trying to install + + cp ${DISTDIR}/${A} p4 +} + +src_install() { + dobin p4 || die +} diff --git a/dev-vcs/perforce-gui/Manifest b/dev-vcs/perforce-gui/Manifest index 7786b13..a1b514c 100644 --- a/dev-vcs/perforce-gui/Manifest +++ b/dev-vcs/perforce-gui/Manifest @@ -1,3 +1,5 @@ -DIST perforce-gui-2010.1.251161-amd64.tgz 38997860 RMD160 210a1e6b445b209ae72b69a1d4b6a9111ede65f4 SHA1 7c4232824ab24313de98ba989ffdc39872078b4d SHA256 ed7130950988fad2c2ef15a2f145d9eae91227ca60372da455909a7a24cb85f0 -DIST perforce-gui-2010.1.251161-x86.tgz 38948530 RMD160 6e4cf7bcb5a74627a3ab1753034178b07bfb70d2 SHA1 61b163c6d715135657626e9cb7a270e5aa57dca5 SHA256 9117f00a64c5c32ced927db24b9a187fc2e565b9dd01960e82d1ce2c28f3f302 -EBUILD perforce-gui-2010.1.251161.ebuild 728 RMD160 73ce2f73b9e1a01f0c150ac5dd55a749eb91437d SHA1 f15152bde2d1c8d940cebaf682126a8700282097 SHA256 5022c94e55ff960c0a4cb142301561e5ce4af77edea1cf4849abe4f8c7f4f039 +AUX 50-perforce-gui 657 RMD160 1667d885b5d10d5f48e3c9d6884bdc836ade6d2a SHA1 de676e5ad647a0faac10b040c1fa692ee05b41db SHA256 aef192848f32920c9185ea40922a65c8f9f65689f32d716e86f4dc6c55d26d13 +AUX p4v.desktop 294 RMD160 ac7ab4a0e26d63522b7b4d1ab47c76f4a1661789 SHA1 88b47a64ea4437e958c3c1a8851ebb01c6777506 SHA256 5fff2615b74cab9daa920d43c98ad202c0849c24308ab1cd2f2ecafb4bfbeb96 +DIST perforce-gui-2010.1.276058-amd64.tgz 38996809 RMD160 4a43eef51fac87170a97e2488eef762c5cec70e7 SHA1 276fa3fec0f6f4d4b23a22fa01eb541353cbc527 SHA256 179c39cfe2d20865bfe002a2c5e5241564f60e31effdc1b0f212bc1a3e6f2067 +DIST perforce-gui-2010.1.276058-x86.tgz 38951891 RMD160 4d2e47d2c7c25aff0bd5452d5be6e7fb099f2547 SHA1 438c43ac2aef985b6fdc3d72a7eeec1565c10b4a SHA256 3a43701c59a8efd2d3aa56df4234558018e228cc9153954dd7d72c518529a304 +EBUILD perforce-gui-2010.1.276058.ebuild 887 RMD160 aba43b22d3959955d435d2616d9d528b27c91b57 SHA1 82182c1be2adffe5dc9816c8ca133ac120cbd1d3 SHA256 72f2db20da1c5f4365127207dd27d205d708e47e695e45f61ae91fa0bb33d6b9 diff --git a/dev-vcs/perforce-gui/files/50-perforce-gui b/dev-vcs/perforce-gui/files/50-perforce-gui new file mode 100644 index 0000000..eecc98d --- /dev/null +++ b/dev-vcs/perforce-gui/files/50-perforce-gui @@ -0,0 +1,14 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header$ +# +# P4V comes with its own libraries and knows where to find them so it will work +# "just fine". +# +# However, without this file in /etc/revdep-rebuild, running the revdep-rebuild tool +# will likely find that p4v is always out of date and will try to rebuild it, which +# won't fix the apparent problem because this is a binary package. + +LD_LIBRARY_MASK="libQtSvgP4.so.4 libQtCLuceneP4.so.4 libQtCoreP4.so.4 libQtGuiP4.so.4 \ +libQtHelpP4.so.4 libQtNetworkP4.so.4 libQtSqlP4.so.4 libQtWebKitP4.so.4 libQtXmlP4.so.4 \ +libQtXmlPatternsP4.so.4" diff --git a/dev-vcs/perforce-gui/files/p4v.desktop b/dev-vcs/perforce-gui/files/p4v.desktop new file mode 100644 index 0000000..62c5a3d --- /dev/null +++ b/dev-vcs/perforce-gui/files/p4v.desktop @@ -0,0 +1,13 @@ +#!/usr/bin/env xdg-open +[Desktop Entry] +Encoding=UTF-8 +Comment[en_US]=Perforce Client GUI +Comment=Perforce Client GUI +Exec=/opt/bin/p4v +GenericName[en_US]=P4V +GenericName=P4V +Icon=/opt/lib/p4v/P4VResources/icons/p4v_32_high.png +Name[en_US]=P4V +Name=P4V +Type=Application +Categories=Development; diff --git a/dev-vcs/perforce-gui/perforce-gui-2010.1.251161.ebuild b/dev-vcs/perforce-gui/perforce-gui-2010.1.251161.ebuild deleted file mode 100644 index 81f3b63..0000000 --- a/dev-vcs/perforce-gui/perforce-gui-2010.1.251161.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header$ - -inherit versionator - -EAPI=2 - -REL=$(get_version_component_range 1-2) -SHORTREL=${REL/#20/} - -DESCRIPTION="GUI for Perforce version control system" -HOMEPAGE="http://www.perforce.com/" -SRC_URI="x86? ( - ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86/p4v.tgz -> \ - ${PF}-x86.tgz ) - amd64? ( - ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86_64/p4v.tgz -> \ - ${PF}-amd64.tgz )" - -LICENSE="perforce" -SLOT="0" -KEYWORDS="-* ~x86 ~amd64" -IUSE="" -RESTRICT="mirror strip" - -S=${WORKDIR} - -src_install() { - cd p4v-${PVR} || die - insopts -m0755 - insinto /opt - doins -r * || die -} diff --git a/dev-vcs/perforce-gui/perforce-gui-2010.1.276058.ebuild b/dev-vcs/perforce-gui/perforce-gui-2010.1.276058.ebuild new file mode 100644 index 0000000..34a9c1e --- /dev/null +++ b/dev-vcs/perforce-gui/perforce-gui-2010.1.276058.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +inherit versionator + +EAPI=2 + +REL=$(get_version_component_range 1-2) +SHORTREL=${REL/#20/} + +DESCRIPTION="GUI for Perforce version control system" +HOMEPAGE="http://www.perforce.com/" +SRC_URI="x86? ( + ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86/p4v.tgz -> \ + ${PF}-x86.tgz ) + amd64? ( + ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86_64/p4v.tgz -> \ + ${PF}-amd64.tgz )" + +LICENSE="perforce" +SLOT="0" +KEYWORDS="-* ~x86 ~amd64" +IUSE="gtk" +RESTRICT="mirror strip test" + +S=${WORKDIR} + +src_install() { + cd p4v-${PVR} || die + insopts -m0755 + insinto /opt + doins -r * || die + + insinto /etc/revdep-rebuild + doins "${FILESDIR}/50-perforce-gui" || die + + if use gtk; then + insinto /usr/share/applications + doins "${FILESDIR}/p4v.desktop" || die + fi +} diff --git a/dev-vcs/perforce-server/Manifest b/dev-vcs/perforce-server/Manifest index 6ab2bdb..ed91e9b 100644 --- a/dev-vcs/perforce-server/Manifest +++ b/dev-vcs/perforce-server/Manifest @@ -1,5 +1,5 @@ -AUX p4d.confd 244 RMD160 14cf335b09b5eea7d2515507bbfeb9673efb88be SHA1 0ebffbc9895389e44fd53dc7bbb734659458cd6b SHA256 fa5ec85b708657cdd5584b3e11aeacf4fad027046685fca576756002b11a6fb7 +AUX p4d.confd 247 RMD160 fee46ecb521f2b470022709802d129aa2c6b5afd SHA1 19b72fce8c19e2625a3e5fe27a2745d05ae9deab SHA256 4d5e014538f150838f05c36eff6432cdb390f42596c9e83f4f248a58cb4c45db AUX p4d.initd 592 RMD160 200311364cc0801f11d79bd9d23c79bc60fac971 SHA1 561a84b753c90972db3bfd9ef633eadc61095786 SHA256 3737adc779b2873e8cb345fe56334c2784f897b467411e6ed541b8ba1c83e2be -DIST perforce-server-2010.1.251161-amd64 2193920 RMD160 573d4ea2f3d6eaf606607f278891168c0953c14c SHA1 1c23f7bca9def456098dde0074a29ba1ce7e1d43 SHA256 9f1aac6ef282fbed60c00b58314aaeb59d2c98a7936b6e23b89a6143b007d2ab -DIST perforce-server-2010.1.251161-x86 2078580 RMD160 32b8939556d33f47905df0525f07b7b849806eec SHA1 654f104457d026c506fc3b3d5972d3425579c821 SHA256 6270a5749db7470f0ce94ca887898b6be0a9c39fca276b6b47c0ad6102aee03d -EBUILD perforce-server-2010.1.251161.ebuild 1171 RMD160 bd661839204f04e36fd4e04a19e197d6d3383361 SHA1 d16e48aeb592d733591484e33b96ba439bed3f83 SHA256 a50c8d26a734ac367c0ceaecdee53ae449ca590837b485fe7183fbec78217766 +DIST perforce-server-2010.1.273938-amd64 2194048 RMD160 a9896855f04a0be4a860bfec95d7733cde0cb6bb SHA1 2f997bf3aca02114030cf9ccb38a6639fa20ca2d SHA256 79379d75cdd3ccd8005809c4e328cef2894ad6d2081dae3e91868683604cb0ee +DIST perforce-server-2010.1.273938-x86 2078612 RMD160 57f532d10f258e88a14ca322d975367a46fe9657 SHA1 0882f23f073c5fb6e8c0e0bbb6c79ca2e811e082 SHA256 c71ce78eaa883e68a55bf6c8edde31619b7d643661058c4ab64dcd4338ed2a3f +EBUILD perforce-server-2010.1.273938.ebuild 1226 RMD160 2cb5b17a15c48f0418ad55367dff1fedfecaba21 SHA1 f10973a546a976dc0465777cb2ca1f0a31129fb0 SHA256 ad9101f0a50235da4c2d2f1d9f58866105448a238924ae4b016f8f99828480f0 diff --git a/dev-vcs/perforce-server/perforce-server-2010.1.251161.ebuild b/dev-vcs/perforce-server/perforce-server-2010.1.251161.ebuild deleted file mode 100644 index 3b4ae35..0000000 --- a/dev-vcs/perforce-server/perforce-server-2010.1.251161.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header$ - -inherit versionator eutils - -EAPI=2 - -REL=$(get_version_component_range 1-2) -SHORTREL=${REL/#20/} - -DESCRIPTION="Perforce version control system server" -HOMEPAGE="http://www.perforce.com/" -SRC_URI="x86? ( ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86/p4d \ - -> ${PF}-x86 ) - amd64? ( - ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86_64/p4d \ - -> ${PF}-amd64 )" - -LICENSE="perforce" -SLOT="0" -KEYWORDS="-* ~x86 ~amd64" -IUSE="" -RESTRICT="mirror strip" - -S=${WORKDIR} - -pkg_setup() { - enewgroup perforce - enewuser perforce -1 -1 /var/lib/perforce perforce -} - -src_unpack() { - - cp ${DISTDIR}/${A} p4d -} - -src_install() { - dosbin p4d - - insinto /etc/conf.d - newins ${FILESDIR}/p4d.confd p4d - - exeinto /etc/init.d - newexe ${FILESDIR}/p4d.initd p4d - - dodir /var/lib/perforce || die - fowners perforce:perforce /var/lib/perforce -} - -pkg_postinst() { - einfo - einfo "Remember to edit the config file /etc/conf.d/p4d" - einfo "By default, the journal file will be created in the same directory as" - einfo "the database." - einfo "We highly recommend moving it to a different hard disk" - einfo -} diff --git a/dev-vcs/perforce-server/perforce-server-2010.1.273938.ebuild b/dev-vcs/perforce-server/perforce-server-2010.1.273938.ebuild new file mode 100644 index 0000000..3b4ae35 --- /dev/null +++ b/dev-vcs/perforce-server/perforce-server-2010.1.273938.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +inherit versionator eutils + +EAPI=2 + +REL=$(get_version_component_range 1-2) +SHORTREL=${REL/#20/} + +DESCRIPTION="Perforce version control system server" +HOMEPAGE="http://www.perforce.com/" +SRC_URI="x86? ( ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86/p4d \ + -> ${PF}-x86 ) + amd64? ( + ftp://ftp.perforce.com/perforce/r${SHORTREL}/bin.linux26x86_64/p4d \ + -> ${PF}-amd64 )" + +LICENSE="perforce" +SLOT="0" +KEYWORDS="-* ~x86 ~amd64" +IUSE="" +RESTRICT="mirror strip" + +S=${WORKDIR} + +pkg_setup() { + enewgroup perforce + enewuser perforce -1 -1 /var/lib/perforce perforce +} + +src_unpack() { + + cp ${DISTDIR}/${A} p4d +} + +src_install() { + dosbin p4d + + insinto /etc/conf.d + newins ${FILESDIR}/p4d.confd p4d + + exeinto /etc/init.d + newexe ${FILESDIR}/p4d.initd p4d + + dodir /var/lib/perforce || die + fowners perforce:perforce /var/lib/perforce +} + +pkg_postinst() { + einfo + einfo "Remember to edit the config file /etc/conf.d/p4d" + einfo "By default, the journal file will be created in the same directory as" + einfo "the database." + einfo "We highly recommend moving it to a different hard disk" + einfo +} -- cgit v1.2.3-65-gdbad