From f1049dc8db243c3af908a25dab3c13c02922c18f Mon Sep 17 00:00:00 2001 From: geos_one Date: Fri, 1 Aug 2008 10:09:05 +0000 Subject: [PATCH] app-admin/fedora-admin-console: repoman cleanup & create versioned symlinks git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@440 6952d904-891a-0410-993b-d76249ca496b --- app-admin/fedora-admin-console/ChangeLog | 4 ++ app-admin/fedora-admin-console/Manifest | 19 +------ .../fedora-admin-console-1.1.1.ebuild | 50 ++++++++++--------- 3 files changed, 32 insertions(+), 41 deletions(-) diff --git a/app-admin/fedora-admin-console/ChangeLog b/app-admin/fedora-admin-console/ChangeLog index 96b77590..a8de7d49 100644 --- a/app-admin/fedora-admin-console/ChangeLog +++ b/app-admin/fedora-admin-console/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 01 Aug 2008; Mario Fetka + fedora-admin-console-1.1.1.ebuild: + repoman cleanup & create versioned symlinks + 19 Jan 2008; Mario Fetka ++, ++, -fedora-admin-console-1.1.0_pre20071111.ebuild: Initial 1.1 FDS diff --git a/app-admin/fedora-admin-console/Manifest b/app-admin/fedora-admin-console/Manifest index d25b49ca..82733edd 100644 --- a/app-admin/fedora-admin-console/Manifest +++ b/app-admin/fedora-admin-console/Manifest @@ -1,20 +1,5 @@ AUX fedora-admin-console-cvs.sh 348 RMD160 cdcb7c99e3bde6e2d83076a6f34226d007e97357 SHA1 17415345c1ddeb1ebc6aa0b38025755c021dfec0 SHA256 3f2335d0c7b017e4e60ac18e48f6469a46e14e01b9bcdddbdf071220e641e968 -MD5 3d990a900b3ef737aaeb2226da3176de files/fedora-admin-console-cvs.sh 348 -RMD160 cdcb7c99e3bde6e2d83076a6f34226d007e97357 files/fedora-admin-console-cvs.sh 348 -SHA256 3f2335d0c7b017e4e60ac18e48f6469a46e14e01b9bcdddbdf071220e641e968 files/fedora-admin-console-cvs.sh 348 DIST fedora-admin-console-1.1.1.tar.bz2 129032 RMD160 c4710d0227f82feb490ca80e140616c057c5de4f SHA1 36fd62edfcba7838ff7e066046147a8f5d032376 SHA256 a1995a99ce53c95097ac2966a7e6902afd00a5aaf5173456eb2b9480ca496d50 -EBUILD fedora-admin-console-1.1.1.ebuild 1751 RMD160 c8e4d79a4a40be55b48a9464f7769551ae5e5fd9 SHA1 8b46aa63d70f1966189a62f8f8dc638ac53a8f7b SHA256 222127dd9207671ee032a8825a1cf7bffb9a07e0ebc29733fa3399770b98b045 -MD5 59defb1eb2a5350b120491f4437ea626 fedora-admin-console-1.1.1.ebuild 1751 -RMD160 c8e4d79a4a40be55b48a9464f7769551ae5e5fd9 fedora-admin-console-1.1.1.ebuild 1751 -SHA256 222127dd9207671ee032a8825a1cf7bffb9a07e0ebc29733fa3399770b98b045 fedora-admin-console-1.1.1.ebuild 1751 -MISC ChangeLog 968 RMD160 ab984ef0c18f79c33ef7ce0a6804dbbe7b1dc5f6 SHA1 45b305f69dd124fe03ed97cbf4345c851dc834b2 SHA256 ca3c2aa143201e7a758fa99105f8088ec7514361b8f837606318241d65a60e29 -MD5 062aea07671ea9cdd60a5651d8369510 ChangeLog 968 -RMD160 ab984ef0c18f79c33ef7ce0a6804dbbe7b1dc5f6 ChangeLog 968 -SHA256 ca3c2aa143201e7a758fa99105f8088ec7514361b8f837606318241d65a60e29 ChangeLog 968 +EBUILD fedora-admin-console-1.1.1.ebuild 1908 RMD160 e2600f743de21b0ca7e7b9228b656753ff38bd2e SHA1 779f9b746b616abddfe9403410e81fcbab4769fe SHA256 1dfcfe3e82569e46a04c0da45f602bd948460f8f46c2d151d8e340017f7cf7d4 +MISC ChangeLog 1103 RMD160 48cdf7842be3b4408637a380068b882af60d7265 SHA1 0ba44efb07411b427ba403c749dee7d57febadb1 SHA256 454ecdecfac0d9a213f1e0e1fd559edb815ca49cb94b20aed2255e4c70b5665b MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 -MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 -RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 -SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170 -MD5 7407899127a754ee85bbf1411fd56da9 files/digest-fedora-admin-console-1.1.1 283 -RMD160 29ce7451d9fe3f9e2217992e1138ca44646be6b5 files/digest-fedora-admin-console-1.1.1 283 -SHA256 4975d7607545f75f36c545b00af62887acb4505279e160d76c0158fd7ec07e73 files/digest-fedora-admin-console-1.1.1 283 diff --git a/app-admin/fedora-admin-console/fedora-admin-console-1.1.1.ebuild b/app-admin/fedora-admin-console/fedora-admin-console-1.1.1.ebuild index 641d4770..d6333f74 100644 --- a/app-admin/fedora-admin-console/fedora-admin-console-1.1.1.ebuild +++ b/app-admin/fedora-admin-console/fedora-admin-console-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -6,13 +6,14 @@ JAVA_PKG_IUSE="doc source" inherit java-pkg-2 eutils java-ant-2 MY_V=1.1.1 +MY_MV=1.1 DESCRIPTION="Fedora Admin Server Management Console" HOMEPAGE="http://directory.fedoraproject.org/" SRC_URI="http://directory.fedoraproject.org/sources/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="1.1" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~x86" IUSE="doc source" COMMON_DEP="=dev-java/jss-4* @@ -22,42 +23,43 @@ RDEPEND=">=virtual/jre-1.5 ${COMMON_DEP}" DEPEND=">=virtual/jdk-1.5 ${COMMON_DEP}" - + src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # gentoo java rules say no jars with version number - # so sed away the version indicator '-' + # so sed away the version indicator '-' sed -e "s!-\*!\*!g" -i build.xml - + java-pkg_jarfrom ldapsdk-4.1 ldapjdk.jar java-pkg_jarfrom jss-3.4 xpclass.jar jss4.jar java-pkg_jarfrom idm-console-framework-1.1 } src_compile() { - eant -Dbuilt.dir=${S}/build \ - -Dldapjdk.location=${S} \ - -Djss.location=${S} \ - -Dconsole.location=${S} ${antflags} - - use doc && eant -Dbuilt.dir=${S}/build \ - -Dldapjdk.location=${S} \ - -Djss.location=${S} \ - -Dconsole.location=${S} ${antflags} javadoc + eant -Dbuilt.dir="${S}"/build \ + -Dldapjdk.location="${S}" \ + -Djss.location="${S}" \ + -Dconsole.location="${S}" ${antflags} + + use doc && eant -Dbuilt.dir="${S}"/build \ + -Dldapjdk.location="${S}" \ + -Djss.location="${S}" \ + -Dconsole.location="${S}" ${antflags} javadoc } src_install() { - java-pkg_jarinto /usr/share/dirsrv/java - java-pkg_newjar ${S}/build/package/fedora-admin-${MY_V}.jar fedora-admin.jar - java-pkg_newjar ${S}/build/package/fedora-admin-${MY_V}_en.jar fedora-admin_en.jar + java-pkg_jarinto /usr/share/dirsrv/html/java + java-pkg_newjar "${S}"/build/package/fedora-admin-${MY_V}.jar fedora-admin.jar + java-pkg_newjar "${S}"/build/package/fedora-admin-${MY_V}_en.jar fedora-admin_en.jar + dosym fedora-admin.jar /usr/share/dirsrv/html/java/fedora-admin-${MY_MV}.jar + dosym fedora-admin_en.jar /usr/share/dirsrv/html/java/fedora-admin-${MY_MV}_en.jar insinto /usr/share/dirsrv/manual/en/admin - doins ${S}/help/en/*.html - doins ${S}/help/en/tokens.map + doins "${S}"/help/en/*.html + doins "${S}"/help/en/tokens.map insinto /usr/share/dirsrv/manual/en/admin/help - doins ${S}/help/en/help/*.html - use doc && java-pkg_dojavadoc build/doc - use source && java-pkg_dosrc src/com - + doins "${S}"/help/en/help/*.html + use doc && java-pkg_dojavadoc build/doc + use source && java-pkg_dosrc src/com }